Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	mailcommon/collectionpage/collectiongeneralpage.cpp
	mailcommon/kernel/mailkernel.cpp
	mailcommon/kernel/mailkernel.h
	pimcommon/util/imapresourcemanager.cpp
wilder-work
Montel Laurent 11 years ago
commit 7bc19fbd15

Diff Content Not Available