Merge branch 'master' of git://anongit.kde.org/kdepim
commit17372c074f85d0d1a0f361799319a10f3aaa8c18
authorMontel Laurent <montel@kde.org>
Fri, 29 Jul 2016 06:28:41 +0000 (29 08:28 +0200)
committerMontel Laurent <montel@kde.org>
Fri, 29 Jul 2016 06:28:41 +0000 (29 08:28 +0200)
treede8e4e06c293fbe9b453b311c451daf0e51306b7
parentf1059b1f1d706f63791233946d4d3ef4440d8576
parent8e2b02f10d3448ea57893ddf34332a5892ddbed3
Merge branch 'master' of git://anongit.kde.org/kdepim