]> git.0d.be Git - empathy.git/commitdiff
Merge remote branch 'alsuren/fix-615734'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 15 Apr 2010 08:20:37 +0000 (10:20 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 15 Apr 2010 08:20:37 +0000 (10:20 +0200)

Trivial merge