projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8977f50 bf6ec91)
Merge branch 'balance-errors'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 21 Oct 2011 21:45:04 +0000 (08:45 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 21 Oct 2011 21:45:04 +0000 (08:45 +1100)

Trivial merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)