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

Trivial merge