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

[Robert Scheck]

commit 510e30feeb89e22bec3718ba77c7a28ead4d0ea5
Merge: 20f1e60 6ee8c0a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 1 14:03:50 2011 +0200

    Merge remote branch 'origin/master' into f15

 .gitignore  |    2 +-
 sources     |    2 +-
 zarafa.spec |   15 +++++----------
 3 files changed, 7 insertions(+), 12 deletions(-)
---
diff --cc zarafa.spec
index d322171,93c8d75..971f4e8
--- a/zarafa.spec
+++ b/zarafa.spec
@@@ -18,9 -18,9 +18,9 @@@
  
  Summary:            Open Source Edition of the Zarafa Collaboration Platform
  Name:               zarafa
- Version:            7.0.1
+ Version:            7.0.2
  %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