Merge branch 'irc-dialog-579800'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 23 Apr 2009 09:55:30 +0000 (10:55 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 23 Apr 2009 09:55:30 +0000 (10:55 +0100)
commit338d2877c0f52c69cf362ab9349d07681dafa89d
tree8dbf708a7f5f91c8e5211ca36fcbc0029a731b17
parent56beb181035248b4aff6927b3397708755ce6588
parent2f154e3477a56517bbcbcabb6684b0989e95995e
Merge branch 'irc-dialog-579800'