]> git.0d.be Git - empathy.git/commitdiff
Merge remote branch 'vminko/fix-634688-v3'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 16 Nov 2010 13:12:28 +0000 (14:12 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 16 Nov 2010 13:12:28 +0000 (14:12 +0100)

Trivial merge