]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a631e25 de93254)
Merge branch 'bug-547658'
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Wed, 17 Nov 2010 14:29:01 +0000 (15:29 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Wed, 17 Nov 2010 14:29:01 +0000 (15:29 +0100)

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