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

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Nov  4 16:56:40 2013 +0000

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

Conflicts:
	spec/Connection_Interface_IRC_Command1.xml

---