From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 23 Apr 2009 09:55:30 +0000 (+0100)
Subject: Merge branch 'irc-dialog-579800'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=338d2877c0f52c69cf362ab9349d07681dafa89d;hp=-c

Merge branch 'irc-dialog-579800'
---

338d2877c0f52c69cf362ab9349d07681dafa89d