Merge branch 'master' of gitorious.org:konversation/konversation master
authorEike Hein <hein@kde.org>
Fri, 26 Feb 2010 22:19:32 +0000 (23:19 +0100)
committerEike Hein <hein@kde.org>
Fri, 26 Feb 2010 22:19:32 +0000 (23:19 +0100)
commit3edc7c528d76057a90f236e1987d43ed4dbbbb40
tree25490f94690613eb5f2c9304f74b1f10e8675bb5
parent2cde6b2bc2a2eb771bf607fd52cc86252d360e20
parentab214a2318061665ab0a9e44d33bd1d22a745291
Merge branch 'master' of gitorious.org:konversation/konversation