Merge commit 'refs/merge-requests/40' of git://gitorious.org/konversation/konversatio...
authorEike Hein <hein@kde.org>
Tue, 16 Feb 2010 00:28:21 +0000 (01:28 +0100)
committerEike Hein <hein@kde.org>
Tue, 16 Feb 2010 00:28:21 +0000 (01:28 +0100)
commite25908af257bb48092a577c428ae44929662c951
tree258bfa263ff5dfe7b01af21e5432e7afc31cf51e
parent3058e0a4ae209371edaa0ad56d2b18f9067e48dc
parent84819624c2daf30eb17710b39a41c86d55d268b9
Merge commit 'refs/merge-requests/40' of git://gitorious.org/konversation/konversation into integration