]> git.0d.be Git - empathy.git/commitdiff
Merge remote branch 'vminko/fix-609942'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 2 Nov 2010 09:05:28 +0000 (10:05 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 2 Nov 2010 09:05:28 +0000 (10:05 +0100)

Trivial merge