From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 14 Mar 2012 09:04:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'em/trivia'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=c8576fca2f6b4100d4101e9cdb983a53079c9457

Merge remote-tracking branch 'em/trivia'
---

c8576fca2f6b4100d4101e9cdb983a53079c9457