telepathy-qt: Merge branch 'trivia'

Wed Jul 4 03:24:27 PDT 2012

Module: telepathy-qt
Branch: master
Commit: 82b68e7d6827d067906b21e1a151ec716a343c89
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=82b68e7d6827d067906b21e1a151ec716a343c89

Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Wed Jul  4 12:23:30 2012 +0200

Merge branch 'trivia'

Reviewed-by: Dario Freddi <dario.freddi at collabora.com>

---