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

[Robert Scheck]

commit 50df742343f2d42b6fbc26b7ef709e6e07d30a2b
Merge: 16759d5 04b111c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Jan 13 01:32:11 2012 +0100

    Merge remote branch 'origin/master' into f15

 .gitignore                    |    2 +-
 sources                       |    2 +-
 zarafa-7.0.3-boost149.patch   |   28 +++++++++
 zarafa-7.0.4-fd_setsize.patch |   36 +++++++++++
 zarafa-7.0.4-php54.patch      |  130 +++++++++++++++++++++++++++++++++++++++++
 zarafa.spec                   |   30 ++++++++--
 6 files changed, 220 insertions(+), 8 deletions(-)
---
diff --cc zarafa.spec
index d03958d,e9cd0e3..6b575d4
--- a/zarafa.spec
+++ b/zarafa.spec
@@@ -18,9 -19,9 +19,9 @@@
  
  Summary:            Open Source Edition of the Zarafa Collaboration Platform
  Name:               zarafa
- Version:            7.0.3
+ Version:            7.0.4
  %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