Merge commit 'refs/merge-requests/24' of git://gitorious.org/konversation/konversatio...
authorEike Hein <hein@kde.org>
Sun, 10 Jan 2010 19:25:27 +0000 (20:25 +0100)
committerEike Hein <hein@kde.org>
Sun, 10 Jan 2010 19:25:27 +0000 (20:25 +0100)
commit0e1eb2e13dab1da02c967e4d3da604994634d519
treea0ef39665d44c1d8596bc213bc21449e7247fbb3
parent2cc87fe94efb73a048e22263619b2a7e770efbc3
parent3ee0b28d28ad566546bef68133c9ce47f9847179
Merge commit 'refs/merge-requests/24' of git://gitorious.org/konversation/konversation into integration