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

[Guillaume Desmottes]

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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Feb 21 17:16:17 2014 +0100

Merge branch 'master' into next

---