telepathy-salut: Merge branch 'trivia-54119'

[Simon McVittie]

Module: telepathy-salut
Branch: master
Commit: bb89834474db06d9e0418da9b14a5e0edcf38696
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=bb89834474db06d9e0418da9b14a5e0edcf38696

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri May  3 11:35:34 2013 +0100

Merge branch 'trivia-54119'

Reviewed-by: Will Thompson <will.thompson at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54119

---