Merge remote-tracking branch 'origin/Applications/15.12'
commitc96ca650c1d7902a0b4cc94ebcdb17f9f287d1c1
authorMontel Laurent <montel@kde.org>
Thu, 3 Mar 2016 06:20:16 +0000 (3 07:20 +0100)
committerMontel Laurent <montel@kde.org>
Thu, 3 Mar 2016 06:20:16 +0000 (3 07:20 +0100)
tree97bbbefef2d736064bab455b4ca563dcfcf0b013
parent188964e3f52dc48fbbfec53edad4a2797b693a18
parentffcf4a2deebd3e3905bb36f02bd756c2e324a89d
Merge remote-tracking branch 'origin/Applications/15.12'
kmail/identity/identityaddvcarddialog.cpp