[zarafa/f15: 3/3] Merge remote branch 'origin/master' into f15

[Robert Scheck]

commit f6851c110a5c0806749ac2d9772da70852497c88
Merge: ced234e 7700964
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jun 19 23:57:16 2012 +0200

    Merge remote branch 'origin/master' into f15

 sources                    |    2 +-
 zarafa-7.0.8-zlib127.patch |   27 +++++++++++++++++++++++++++
 zarafa.spec                |   11 ++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)
---
diff --cc zarafa.spec
index c6e4227,1eb63c9..1239be6
--- a/zarafa.spec
+++ b/zarafa.spec
@@@ -19,9 -19,9 +19,9 @@@
  
  Summary:            Open Source Edition of the Zarafa Collaboration Platform
  Name:               zarafa
- Version:            7.0.7
+ Version:            7.0.8
  %if %{beta_or_rc}
 -Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 +Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}.1
  %else
  Release:            %{actual_release}%{?dist}
  %endif