[next] telepathy-spec: Merge branch 'master' into next

[Simon McVittie]

Module: telepathy-spec
Branch: next
Commit: c957eb0ac681d2aed33cc25ef732ff1d9df13a79
URL:    http://cgit.freedesktop.org/telepathy/telepathy-spec/commit/?id=c957eb0ac681d2aed33cc25ef732ff1d9df13a79

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Oct 14 14:43:24 2013 +0100

Merge branch 'master' into next

Conflicts:
	spec/Connection_Interface_Renaming1.xml

---