[zarafa/f15] (4 commits) ...Merge branch 'f15' of ssh://pkgs.fedoraproject.org/zarafa into f15

[Robert Scheck]

Summary of changes:

  d4b9b96... - Upgrade to 7.0.4 - Added patch for rebuilding with PHP 5. (*)
  04b111c... Uploaded source for 7.0.4 (*)
  50df742... Merge remote branch 'origin/master' into f15
  ea92498... Merge branch 'f15' of ssh://pkgs.fedoraproject.org/zarafa i

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