]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'av-crash-633816'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 3 Nov 2010 15:59:05 +0000 (16:59 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 3 Nov 2010 15:59:05 +0000 (16:59 +0100)

Trivial merge