Merge branch 'master' of gitorious.org:konversation/konversation
authorEike Hein <hein@kde.org>
Fri, 5 Feb 2010 10:52:22 +0000 (11:52 +0100)
committerEike Hein <hein@kde.org>
Fri, 5 Feb 2010 10:52:22 +0000 (11:52 +0100)
commit1e11eb2fccdca2dd633579d3c0da0599895e9ee0
tree31f0521a6c91c0067feeba7d6d6f46706d193c3a
parentdc4fc41ca3efdc6641d5158e8b887d34cfb48fc3
parentd40a032947b5dca05a4a556d8fcec2f91852a4c2
Merge branch 'master' of gitorious.org:konversation/konversation