]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8eb3671 1acf899)
Merge remote branch 'glassrose/Display-typing-icon-in-muc-contacts-list-609419'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 18 Jan 2011 15:12:40 +0000 (16:12 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 18 Jan 2011 15:12:40 +0000 (16:12 +0100)

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