]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebd34b4 e2bf0b6)
Merge branch 'chooser-662250'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 20 Oct 2011 22:32:08 +0000 (09:32 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Thu, 20 Oct 2011 22:32:08 +0000 (09:32 +1100)

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