From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Fri, 21 Oct 2011 21:45:04 +0000 (+1100)
Subject: Merge branch 'balance-errors'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=60a28f1712b841606b278cad8f3637b346063a79

Merge branch 'balance-errors'
---

60a28f1712b841606b278cad8f3637b346063a79