b835604 Check in the latest from git

Authored and Committed by Jeroen van Meeuwen (Kolab Systems) 12 years ago
    Check in the latest from git
    
        
file modified
+4 -1
file modified
+1 -1