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

Conflicts: libkolabxml.spec
2012-07-25 10:37:38 +02:00 · 2012-07-25 10:37:38 +02:00 · da8760f14e
commit da8760f14e
parent b0101d73b7 c8e669cf35
1 changed files with 3 additions and 0 deletions
--- a/libkolabxml.spec
+++ b/libkolabxml.spec
@ -193,6 +193,9 @@ rm -rf %{buildroot}
 * Wed Jul 25 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.0-1
 - New upstream version

+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@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@kolabsys.com> - 0.6.0-3
 - Correct dependency on php