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

[Simon McVittie]

Module: telepathy-salut
Branch: next
Commit: 136ef5f3b5b307a9d70215ac1f0684b5c50e2cb4
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=136ef5f3b5b307a9d70215ac1f0684b5c50e2cb4

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Nov  5 17:40:47 2013 +0000

Merge branch 'master' into next

Conflicts:
	configure.ac

---