Git commit 8054221b7b60cbf30e16facbcb35e75aceb6f1fe by David Jarvie.
Committed on 31/07/2013 at 23:15.
Pushed by djarvie into branch 'master'.

Merge branch 'KDE/4.11'


http://commits.kde.org/kdepim/8054221b7b60cbf30e16facbcb35e75aceb6f1fe