[next] telepathy-spec: Merge commit ' 1791e84e583eb268bbcb82e05801ba6dd0137ab3' into next

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 26 19:29:44 2013 +0100

Merge commit '1791e84e583eb268bbcb82e05801ba6dd0137ab3' into next

Conflicts:
	NEWS

---