8c4497d Merge branch 'f18' into el6

Merged and Committed by limb 11 years ago
    Merge branch 'f18' into el6
    
    Conflicts:
    	.gitignore
    	roundcubemail.spec
    	sources
    
        
file modified
+3 -11
file modified
+8 -0
file modified
+28 -4
file modified
+1 -1