]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'send-errors'
authorWill Thompson <will.thompson@collabora.co.uk>
Mon, 31 Aug 2009 09:59:21 +0000 (10:59 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Mon, 31 Aug 2009 09:59:21 +0000 (10:59 +0100)

Trivial merge