8ee25c7 Merge branch 'master' into f19

Merged and Committed by sharkcz 10 years ago
    Merge branch 'master' into f19
    
        
file modified
+6 -1