]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'debug-fixes'
authorJonny Lamb <jonny.lamb@collabora.co.uk>
Fri, 5 Jun 2009 11:24:21 +0000 (12:24 +0100)
committerJonny Lamb <jonny.lamb@collabora.co.uk>
Fri, 5 Jun 2009 11:24:21 +0000 (12:24 +0100)

Trivial merge