]> git.0d.be Git - empathy.git/commitdiff
Merge commit 'maiku/bug_598332'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 19 Oct 2009 13:32:53 +0000 (14:32 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 19 Oct 2009 13:32:53 +0000 (14:32 +0100)

Trivial merge