]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'auto-approve'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 9 Jul 2010 11:52:05 +0000 (13:52 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 9 Jul 2010 11:52:05 +0000 (13:52 +0200)

Trivial merge