]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'update-display-name-603463'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 3 Mar 2010 10:54:57 +0000 (11:54 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 3 Mar 2010 10:54:57 +0000 (11:54 +0100)

Trivial merge