]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 182b9fa 60ceff6)
Merge branch 'contact-info-630421'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 4 Nov 2010 08:16:41 +0000 (09:16 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 4 Nov 2010 08:16:41 +0000 (09:16 +0100)

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