Merge branch 'master' of gitorious.org:konversation/konversation
authorEike Hein <hein@kde.org>
Mon, 11 Jan 2010 12:28:18 +0000 (13:28 +0100)
committerEike Hein <hein@kde.org>
Mon, 11 Jan 2010 12:28:18 +0000 (13:28 +0100)
commite70795dcd0d1abac4db81e52d34d7212dc480d0e
treef335fc40596f222e112a5c2f576070c4ba6219b8
parent75c0e7d3caa868fd997eb90f5a32d2ec2046d333
parent7d1cb2fae86290da76ee0d0ded602c777f6e0ac8
Merge branch 'master' of gitorious.org:konversation/konversation