996d85f Merge branch 'master' into f19

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