]> git.0d.be Git - empathy.git/commitdiff
Merge branch 'irc-dialog'
authorWill Thompson <will.thompson@collabora.co.uk>
Mon, 25 Jul 2011 11:43:10 +0000 (12:43 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Mon, 25 Jul 2011 11:43:59 +0000 (12:43 +0100)
Fixes: <https://bugzilla.gnome.org/show_bug.cgi?id=654552>
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>

Trivial merge