[next] telepathy-spec: Merge remote-tracking branch 'origin/master' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Sep 27 14:14:52 2013 +0100

Merge remote-tracking branch 'origin/master' into next

Conflicts:
	NEWS
	spec/Channel.xml
	spec/Connection.xml
	spec/all.xml

---