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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Mon Oct 28 17:36:31 2013 +0100

Merge branch 'master' into my-next

I changed the Telepathy namespace to use the new one.

Conflicts:
	NEWS
	spec/Connection_Interface_Renaming1.xml
	spec/Connection_Interface_Sidecars1.xml
	spec/all.xml

---