77b9e26 Merge branch 'master' into f18

Merged and Committed by Jeroen van Meeuwen (Kolab Systems) 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	libkolabxml.spec
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1