]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b95223f 3caeda4)
Merge branch 'history-ui'
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Tue, 21 Jun 2011 11:52:47 +0000 (12:52 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Tue, 21 Jun 2011 11:52:47 +0000 (12:52 +0100)

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