]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'mallard-to-merge'
authorFrédéric Péters <fpeters@0d.be>
Wed, 12 Aug 2009 16:40:34 +0000 (18:40 +0200)
committerFrédéric Péters <fpeters@0d.be>
Wed, 12 Aug 2009 16:40:34 +0000 (18:40 +0200)

Trivial merge