Conflicts:
	akonadi/tag.cpp

Conflicts:
	akonadi/src/core/itemsync.cpp

Conflicts:
	akonadi-contact/src/CMakeLists.txt

Conflicts:
	CMakeLists.txt

Conflicts:
	akonadi/src/core/itemsync.cpp

Conflicts:
	akonadi/collectionrequester.h
	akonadi/itemsearchjob.cpp
	akonadi/recentcollectionaction.cpp
	akonadi/recentcollectionaction_p.h
	akonadi/standardactionmanager.cpp
	kabc/plugins/dir/dir.desktop
	kabc/plugins/file/file.desktop
	kabc/plugins/ldapkio/ldapkio.desktop
	kabc/plugins/net/net.desktop
	kcal/localdir.desktop

Conflicts:
	akonadi/collectionrequester.h

@PACKAGE_INIT@ already adds one.

Merge remote-tracking branch 'origin/KDE/4.13' (conflict all the time with fix indent... I will finish to make fix in master only...)

Conflicts:
	akonadi/recentcollectionaction.cpp

Conflicts:
	akonadi/recentcollectionaction.cpp
	akonadi/recentcollectionaction_p.h
	akonadi/standardactionmanager.cpp

Conflicts:
	akonadi/recentcollectionaction.cpp
	akonadi/recentcollectionaction_p.h
	akonadi/standardactionmanager.cpp

Conflicts:
	akonadi/itemsearchjob.cpp
	akonadi/standardactionmanager.cpp

Conflicts:
	kabc/vcardparser/testroundtrip.qrc
	kpimidentities/signatureconfigurator.cpp