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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri May 11 14:25:51 2012 +0100

Merge branch 'master' into next

Conflicts:
	spec/Protocol_Interface_Presence1.xml
	spec/all.xml

---