]> git.0d.be Git - empathy.git/commitdiff
Merge commit 'kaserf/buttons-infobar-606329'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 25 Jan 2010 14:19:05 +0000 (14:19 +0000)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 25 Jan 2010 14:19:05 +0000 (14:19 +0000)

Trivial merge