217f831 Merge branch 'master' into f18

Merged and Committed by Jeroen van Meeuwen (Ergo Project) 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	cyrus-imapd.spec
    
        
file modified
+1 -0
file modified
+14 -2
file modified
+1 -1