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

[Robert Scheck]

commit ced234e337b6abd92663bcf335eb24bb199788de
Merge: c03b00a 43789b1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed May 9 00:34:30 2012 +0200

    Merge remote branch 'origin/master' into f15

 .gitignore                    |    2 +-
 sources                       |    2 +-
 zarafa-7.0.4-fd_setsize.patch |   36 ------------------------------------
 zarafa.spec                   |   14 ++++++++------
 4 files changed, 10 insertions(+), 44 deletions(-)
---
diff --cc zarafa.spec
index d9c6795,1cec247..c6e4227
--- 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.6
+ Version:            7.0.7
  %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