Merge commit 'refs/merge-requests/43' of git://gitorious.org/konversation/konversatio...
authorEike Hein <hein@kde.org>
Thu, 22 Apr 2010 10:28:11 +0000 (12:28 +0200)
committerEike Hein <hein@kde.org>
Thu, 22 Apr 2010 10:28:11 +0000 (12:28 +0200)
commit4889f44d3689e70585b0da7013234967b0bbf3f7
tree3f82895672b41a88698af925e759efcac26b1a0f
parent91f84da2065a0a79958a450fbbe5eafc82b2ee7c
parentc4cc75fdb59987ba0bf2d25c62c63619476da9b1
Merge commit 'refs/merge-requests/43' of git://gitorious.org/konversation/konversation into integration
src/irc/server.cpp