Merge branch 'master' of gitorious.org:konversation/konversation
authorEike Hein <hein@kde.org>
Wed, 12 May 2010 19:37:17 +0000 (21:37 +0200)
committerEike Hein <hein@kde.org>
Wed, 12 May 2010 19:37:17 +0000 (21:37 +0200)
commitac125525a1d036a3299408f7c1704dc6df4d51fa
tree71162f44f3249e35a17befe9ebf37ebef2824ced
parent8c2a7d23a0d168be5b22d76bb062bb1ab848e5c9
parentff68fcf8ad8b8b80878c1feada1d3e9d2c540873
Merge branch 'master' of gitorious.org:konversation/konversation