]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'desktop-schema-626810'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 16 Nov 2010 13:11:05 +0000 (14:11 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 16 Nov 2010 13:11:05 +0000 (14:11 +0100)

Trivial merge