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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Sep 16 16:25:24 2013 +0100

Merge branch 'master' into next

Conflicts:
	spec/Channel_Type_Room_List1.xml

---