Merge branch 'master' of gitorious.org:konversation/konversation
authorEike Hein <hein@kde.org>
Sat, 6 Feb 2010 10:55:29 +0000 (11:55 +0100)
committerEike Hein <hein@kde.org>
Sat, 6 Feb 2010 10:55:29 +0000 (11:55 +0100)
commit5a904cfd99f03a0949058d6e5bebb595cd814bfc
tree6acb786ee55289ac0cb2ad03157d22a07cc0ca82
parent09dc5d62b3f33b2097ac9bc5af73c7ae6766ba1f
parent55356dac14ebed7eed93785f046f71318653d2b4
Merge branch 'master' of gitorious.org:konversation/konversation