]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'muc-crash-633329'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 29 Oct 2010 07:50:04 +0000 (09:50 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 29 Oct 2010 07:50:04 +0000 (09:50 +0200)

Trivial merge