Git commit f9b5eeae2dcee2b3232cd45b02790c764700f1cc by Eike Hein.
Committed on 31/03/2015 at 23:27.
Pushed by hein into branch 'master'.

Merge branch '1.6'


http://commits.kde.org/konversation/f9b5eeae2dcee2b3232cd45b02790c764700f1cc