]> git.0d.be Git - empathy.git/commitdiff
Merge remote branch 'sjoerd/dislay-leaks'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 26 Apr 2010 07:38:09 +0000 (09:38 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 26 Apr 2010 07:38:09 +0000 (09:38 +0200)

Trivial merge