Merge remote-tracking branch 'origin/Applications/15.12'
commita47e38153a84d3dcc8ede1b6d4394f54f7ad2fc9
authorMontel Laurent <montel@kde.org>
Mon, 1 Feb 2016 07:15:14 +0000 (1 08:15 +0100)
committerMontel Laurent <montel@kde.org>
Mon, 1 Feb 2016 07:15:14 +0000 (1 08:15 +0100)
treea1fc64e2e99a64490a97df290d6b66ef60265136
parent5c052e37258dcee6b703a12d316c6b9a584ed781
parent9e3989b0c37e3b869e9cf77f0d8339f98c80993b
Merge remote-tracking branch 'origin/Applications/15.12'
kmail/editor/kmcomposewin.cpp