Conflicts:
	blogilo/src/storageservice/storageservicemanagersettingsjob.h
	kleopatra/commands/refreshopenpgpcertscommand.cpp
	kleopatra/commands/refreshx509certscommand.cpp
	kleopatra/dialogs/deletecertificatesdialog.cpp
	kmail/storageservice/storageservicesettingsjob.h
	messagecomposer/composer/composer.cpp
	messagecomposer/composer/keyresolver.cpp
	messagecomposer/composer/keyresolver.h
	pimcommon/storageservice/tests/testsettingsjob.h
	storageservicemanager/storageservicemanagersettingsjob.h