]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'new-log-window'
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Fri, 10 Jun 2011 08:32:28 +0000 (09:32 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Fri, 10 Jun 2011 08:32:28 +0000 (09:32 +0100)

Trivial merge