]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'bug-607146'
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Mon, 15 Nov 2010 15:01:01 +0000 (16:01 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Mon, 15 Nov 2010 15:01:01 +0000 (16:01 +0100)

Trivial merge