From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Wed, 16 May 2012 10:51:19 +0000 (+1000)
Subject: Merge branch 'misc'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=83f0c13e333dea2c4e510d9eb2e2befbd5ee0be3

Merge branch 'misc'
---

83f0c13e333dea2c4e510d9eb2e2befbd5ee0be3