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

[Robert Scheck]

commit 00cb5e0f906afd44aa4bfeb2d6f03e121092e1ca
Merge: 7739e80 d37b1b3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Aug 25 22:46:52 2014 +0200

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

 zarafa.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc zarafa.spec
index 76337b0,f310fb1..2750d7f
--- a/zarafa.spec
+++ b/zarafa.spec
@@@ -916,9 -916,9 +916,12 @@@ f
  %{python_sitearch}/*
  
  %changelog
 +* Mon Aug 25 2014 Robert Scheck <robert at fedoraproject.org> 7.1.10-4
 +- Fixed multiple incorrect default permissions (#1133439)
 +
+ * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1.10-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
  * Mon Jul 14 2014 Robert Scheck <robert at fedoraproject.org> 7.1.10-3
  - Rebuild for gSOAP 2.8.17