9a93eae Update to upstream version 1.4

Authored and Committed by msimacek 9 years ago
    Update to upstream version 1.4
    
        
file modified
+1 -0
file modified
+10 -8
file modified
+1 -1