Merge remote-tracking branch 'origin/KDE/4.12'
Conflicts: kontact/plugins/specialdates/kcmsdsummary.desktop