]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d191659 0f19e7e)
Merge branch 'bigger-favourite-chatrooms'
authorWill Thompson <will.thompson@collabora.co.uk>
Mon, 27 Jun 2011 13:02:48 +0000 (14:02 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Mon, 27 Jun 2011 13:02:48 +0000 (14:02 +0100)

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