]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'kill-dispatcher-632550'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 20 Oct 2010 09:02:25 +0000 (11:02 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 20 Oct 2010 09:02:25 +0000 (11:02 +0200)

Trivial merge