]> git.0d.be Git - empathy.git/commit
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)
commit335d9576a93088c11a44de1cdb9c3884a285d95e
treee5d1dd16a2a3b4d5433ac182863b15af737e86a1
parentfb56e32dcdc0ad78c59c3d34d500a24c954a6ab0
parent6b35d5c27162fdf750a6d1e193e31e51dfe225dd
Merge branch 'trivia'