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

[Robert Scheck]

commit c03b00aab2e97a63495ac652d7a36fce00513ce0
Merge: ea92498 2d71de1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Apr 22 05:49:32 2012 +0200

    Merge remote branch 'origin/master' into f15

 .gitignore                  |    2 +-
 sources                     |    2 +-
 zarafa-7.0.3-boost149.patch |   28 ---------
 zarafa-7.0.4-php54.patch    |  130 -------------------------------------------
 zarafa.spec                 |   82 +++++++++++++++------------
 5 files changed, 47 insertions(+), 197 deletions(-)
---
diff --cc zarafa.spec
index 6b575d4,a9518e8..d9c6795
--- 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.4
+ Version:            7.0.6
  %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