Merge commit 'refs/merge-requests/46' of git://gitorious.org/konversation/konversatio...
authorEike Hein <hein@kde.org>
Sun, 25 Apr 2010 20:39:05 +0000 (22:39 +0200)
committerEike Hein <hein@kde.org>
Sun, 25 Apr 2010 20:39:05 +0000 (22:39 +0200)
commit4d7651c7b29894a16dd27b887b2593a213331b09
treeb947ebe903936c6bf9485fd12b47fb06081509a0
parent5aec3c654a567f1fd12e0a6c3b9f599c043d9004
parenta91633f0cab4179511e1ff5a11480870d11bf5d1
Merge commit 'refs/merge-requests/46' of git://gitorious.org/konversation/konversation into integration