5443416 updated to latest upstream version 2.5.4

Authored and Committed by mrunge 8 years ago
    updated to latest upstream version 2.5.4
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1