From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 13 Mar 2012 10:31:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'em/trivia'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f6539f8868bb40842ffe018662112e236b72fd24;ds=sidebyside

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

f6539f8868bb40842ffe018662112e236b72fd24