projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1dd662 2a98cb3)
Merge branch 'butterfly-conference-misc'
authorJonny Lamb <jonnylamb@gnome.org>
Thu, 11 Mar 2010 11:35:45 +0000 (11:35 +0000)
committerJonny Lamb <jonnylamb@gnome.org>
Thu, 11 Mar 2010 11:35:45 +0000 (11:35 +0000)

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