]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b4c1e7 e53b700)
Merge branch 'trivia'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 7 Jun 2010 12:18:06 +0000 (22:18 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 7 Jun 2010 12:18:06 +0000 (22:18 +1000)

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