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

Merged and Committed by Jeroen van Meeuwen (Kolab Systems) 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libkolabxml
    
    Conflicts:
    	libkolabxml.spec
    
        
file modified
+6 -0