[z-push] (7 commits) ...Only need z-push-zarafa for Zarafa, which is no longer in Fedora, rfbz #3892

[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

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