Merge branch 'master' of git://anongit.kde.org/kdepim
commit8cb01c3b0db3ea12df36d509a1542c8cd399605e
authorMontel Laurent <montel@kde.org>
Tue, 26 Jul 2016 11:48:03 +0000 (26 13:48 +0200)
committerMontel Laurent <montel@kde.org>
Tue, 26 Jul 2016 11:48:03 +0000 (26 13:48 +0200)
treef898e780113e50e10721fc4789e596c0f7601388
parent47153bef85f75cb70c736d55ae19c98f72043a27
parent8be3a2d7ee71f091052522f1147dd9c7dfc50972
Merge branch 'master' of git://anongit.kde.org/kdepim