b41ae5e upgrade to upstream version 3.6.1

Authored and Committed by sharkcz 12 years ago
    upgrade to upstream version 3.6.1
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1