]> git.0d.be Git - empathy.git/commitdiff
Merge commit 'ksz/rfb'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 10 Aug 2009 15:03:18 +0000 (16:03 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 10 Aug 2009 15:03:18 +0000 (16:03 +0100)

Trivial merge