]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb56e32 6b35d5c)
Merge branch 'trivia'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 19 Aug 2011 07:33:42 +0000 (17:33 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 19 Aug 2011 07:33:42 +0000 (17:33 +1000)

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