Merge commit 'refs/merge-requests/36' of git://gitorious.org/konversation/konversatio...
authorEike Hein <hein@kde.org>
Sun, 17 Jan 2010 22:02:32 +0000 (23:02 +0100)
committerEike Hein <hein@kde.org>
Sun, 17 Jan 2010 22:02:32 +0000 (23:02 +0100)
commit0fca3fe7d1d2eb629c5299fedf39cfa177f29833
tree23ec3f00eb984fff04b488b6744a5223a68f4ffd
parent4e3e754c33719656257324ef5deabd6d88b8044a
parent1f22005d641cc3c3adbd81cdb4c9e11296031e34
Merge commit 'refs/merge-requests/36' of git://gitorious.org/konversation/konversation into integration