]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43383be b7a0aba)
Merge branch 'ui-work-672043'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Wed, 30 May 2012 00:52:10 +0000 (10:52 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Wed, 30 May 2012 00:52:10 +0000 (10:52 +1000)

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