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

[Robert Scheck]

commit 20f1e60df9d53cf74a225c512d3a913bcd948dba
Merge: 14a6926 28e9711
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Aug 14 01:57:52 2011 +0200

    Merge remote branch 'origin/master' into f15

 .gitignore                 |    2 +-
 sources                    |    2 +-
 zarafa-7.0.0-cpp_std.patch |   14 -----
 zarafa.logrotate           |   10 ++++
 zarafa.spec                |  128 ++++++++++++++++----------------------------
 5 files changed, 59 insertions(+), 97 deletions(-)
---
diff --cc zarafa.spec
index 4e6c446,8f44767..d322171
--- 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.0
+ Version:            7.0.1
  %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