]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'chat-resize-635022'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 22 Nov 2010 08:00:08 +0000 (09:00 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 22 Nov 2010 08:00:08 +0000 (09:00 +0100)

Trivial merge