613fb06 Merge branch 'f19' into f18

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