Merge commit 'refs/merge-requests/42' of git://gitorious.org/konversation/konversatio...
authorEike Hein <hein@kde.org>
Wed, 31 Mar 2010 19:34:58 +0000 (21:34 +0200)
committerEike Hein <hein@kde.org>
Wed, 31 Mar 2010 19:34:58 +0000 (21:34 +0200)
commite736769e7442e1fa546cbbe249d50e98164bc305
tree042b01fa895bc9beccd0253303bb53cc92d0ee08
parent51c20ebc0cb6a15aa69c96c364d956c5fdbc16a9
parent1cae2bad4a61c6c94ffa681aa33ebd3b91f022de
Merge commit 'refs/merge-requests/42' of git://gitorious.org/konversation/konversation into integration