From kde-commits  Tue Mar 31 23:27:53 2015
From: Eike Hein <hein () kde ! org>
Date: Tue, 31 Mar 2015 23:27:53 +0000
To: kde-commits
Subject: [konversation] /: Merge branch '1.6'
Message-Id: <E1Yd5ZZ-0006FO-8F () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=142784448200802

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