]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c698741 90d1301)
Merge branch 'balance-rebase'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 08:30:33 +0000 (18:30 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 5 May 2011 08:30:33 +0000 (18:30 +1000)

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