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

[Simon McVittie]

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

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

Merge branch 'master' into next

Conflicts:
	spec/all.xml

---