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

Conflicts:
	CMakeLists.txt

CMakeLists.txt

@@ -166,7 +166,7 @@ else()
 # Otherwise...
 ############### Find the stuff we need ###############
   # Akonadi
-  find_package(Akonadi 1.12.1 QUIET CONFIG)
+  find_package(Akonadi 1.12.90 QUIET CONFIG)
   set_package_properties(Akonadi PROPERTIES DESCRIPTION "Akonadi server libraries" URL "http://pim.kde.org/akonadi" TYPE REQUIRED PURPOSE "Akonadi is required to build KDEPIM")
 
   find_package(ZLIB)