From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Fri, 14 Oct 2011 04:27:12 +0000 (+1100)
Subject: Merge remote-tracking branch 'pochu/misc-fixes'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=7b6b8da406493311445f6c2470a005a542972693

Merge remote-tracking branch 'pochu/misc-fixes'
---

7b6b8da406493311445f6c2470a005a542972693