83223c1 Merge branch 'f16' into f15

Merged and Committed by limb 11 years ago
    Merge branch 'f16' into f15
    
    Conflicts:
    	roundcubemail.spec
    
        
file modified
+4 -0
file modified
+30 -22
file modified
+1 -1