[z-push/f25] (9 commits) ...new-source z-push-2.2.12.tar.gz

[Sérgio M. Basto]

Summary of changes:

  171e21d... Merge branches 'master' and 'el5' into el5 (*)
  e8703f4... Merge branches 'master' and 'el6' into el6 (*)
  564b70a... Merge branch 'el5' into el6 (*)
  1d6a0e8... Upgrade to 2.2.9 (*)
  d081fe2... Revert last commit to merge el branches (*)
  ad06ec1... Merge branch 'el6' (*)
  c3fcdc8... Only need z-push-zarafa for Zarafa, which is no longer in F (*)
  be05712... Update to 2.2.12 (*)
  e1bddf3... new-source z-push-2.2.12.tar.gz (*)

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