[zarafa: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/zarafa

[Robert Scheck]

commit 67ea84810be20dca809def4639f19317807224af
Merge: 9d719ee b7e65a1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 1 12:55:30 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/zarafa
    
    Conflicts:
    	zarafa.spec

 zarafa.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc zarafa.spec
index 93c8d75,de8705c..a1e23c6
--- a/zarafa.spec
+++ b/zarafa.spec
@@@ -1,7 -1,7 +1,13 @@@
  %global beta_or_rc      0
++<<<<<<< HEAD
 +%global actual_release  1
 +%global svnrevision     29470
 +%global with_clucene    1
++=======
+ %global actual_release  2
+ %global svnrevision     28479
+ %global with_clucene    0
++>>>>>>> b7e65a1021153fb2216cf1b1cc0d3a1c7e0151f3
  %global with_ldap       1
  %global with_xmlto      1
  %global no_multiupload  1