]> git.0d.be Git - empathy.git/commitdiff
Merge remote branch 'vminko/fix-625780'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 22 Oct 2010 12:18:34 +0000 (14:18 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 22 Oct 2010 12:18:34 +0000 (14:18 +0200)

Trivial merge