da089c8 Merge branch 'f20'

Merged and Committed by ajax 10 years ago
    Merge branch 'f20'
    
    Reset to f20's content
    
        
file modified
+4 -4