[libkolabxml/f18: 2/2] Merge branch 'master' into f18

[Jeroen van Meeuwen]

commit 77b9e260b5ca6058c8616e63fc3acc83f96c08cd
Merge: 910946a 372e229
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Feb 26 11:36:03 2013 +0000

    Merge branch 'master' into f18
    
    Conflicts:
    	libkolabxml.spec

 .gitignore       |    1 +
 libkolabxml.spec |    7 +++++--
 sources          |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc libkolabxml.spec
index 21c1cdc,d6e1de0..15e00cb
--- a/libkolabxml.spec
+++ b/libkolabxml.spec
@@@ -303,9 -301,9 +303,12 @@@ rm -rf %{buildroot
  %endif
  
  %changelog
+ * Tue Feb 26 2013 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.8.3-1
+ - New upstream release with file format handling
+ 
 +* Wed Aug 22 2012 Dan Horák <dan[at]danny.cz> - 0.8.1-2
 +- build csharp subpackage only when Mono exists
 +
  * Wed Aug 15 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.8.1-1
  - New upstream version 0.8.1
  - Revert s/qt-devel/qt4-devel/ - just require the latest qt-devel