]> git.0d.be Git - empathy.git/commitdiff
Merge remote-tracking branch 'danni/trivia'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 27 Jan 2012 10:14:26 +0000 (11:14 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 27 Jan 2012 10:14:26 +0000 (11:14 +0100)

Trivial merge