]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'release'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 1 Feb 2011 14:31:19 +0000 (15:31 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 1 Feb 2011 14:31:19 +0000 (15:31 +0100)

Trivial merge