From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 15 Nov 2010 13:44:35 +0000 (+0100)
Subject: Merge branch 'trivia'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=750f7705fe5d58f2c13a57d5e3c844aa0f205e10

Merge branch 'trivia'
---

750f7705fe5d58f2c13a57d5e3c844aa0f205e10