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

[Jeroen van Meeuwen]

commit da8760f14ef284e26feb73ee68d9738f2b8f6b17
Merge: b0101d7 c8e669c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jul 25 10:37:38 2012 +0200

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

 libkolabxml.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc libkolabxml.spec
index a9d6b22,6d8a2c7..aeda102
--- a/libkolabxml.spec
+++ b/libkolabxml.spec
@@@ -190,9 -189,9 +190,12 @@@ rm -rf %{buildroot
  %{python_sitearch}/_kolabformat.so
  
  %changelog
 +* Wed Jul 25 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.7.0-1
 +- New upstream version
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Wed Jun 27 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6.0-3
  - Correct dependency on php