]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'av-candidate-624344'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 5 Aug 2010 10:06:53 +0000 (12:06 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 5 Aug 2010 10:06:53 +0000 (12:06 +0200)

Trivial merge