]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c17630 2b92c53)
Merge branch 'history-misc'
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 23 Jun 2011 08:02:03 +0000 (09:02 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 23 Jun 2011 08:02:03 +0000 (09:02 +0100)

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