]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'gtk-style-636654'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 15 Dec 2010 16:01:37 +0000 (17:01 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 15 Dec 2010 16:01:37 +0000 (17:01 +0100)

Trivial merge