]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'unbreak-tests'
authorStef Walter <stefw@collabora.co.uk>
Tue, 22 Mar 2011 16:16:35 +0000 (17:16 +0100)
committerStef Walter <stefw@collabora.co.uk>
Tue, 22 Mar 2011 16:16:35 +0000 (17:16 +0100)

Trivial merge