]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6baa8e2 4354a8d)
Merge remote branch 'wjt/avatars-in-boxes-theme'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 28 Apr 2010 14:32:07 +0000 (16:32 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 28 Apr 2010 14:32:07 +0000 (16:32 +0200)

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