]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 79c2194 08cf375)
Merge branch 'show-assistant-611131'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 26 Feb 2010 22:19:13 +0000 (09:19 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 26 Feb 2010 22:19:13 +0000 (09:19 +1100)

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