]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'enabled-first-604166'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 9 Dec 2009 17:28:43 +0000 (17:28 +0000)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 9 Dec 2009 17:28:43 +0000 (17:28 +0000)

Trivial merge