[akonadi/f20] (7 commits) ...Merge commit 'adf30afcb0ca46b6eedf9bdedbd9275f5b52e4f4' into f20

[Rex Dieter]

Summary of changes:

  b80c244... explicitly s/mysql-server/mariadb-server/ (*)
  002028f... explicitly Requires: mariadb-server/mysql-server as appropr (*)
  8acc3d6... latest 1.13 branch fixes (*)
  f8437d9... drop el6/cmake hacks (*)
  ea4f267... Rebuild for boost 1.57.0 (*)
  adf30af... latest 1.13 branch fixes (*)
  e0ada37... Merge commit 'adf30afcb0ca46b6eedf9bdedbd9275f5b52e4f4' int

(*) This commit already existed in another branch; no separate mail sent