637a374 Update to upstream version 4.12

Authored and Committed by mizdebsk 9 years ago
    Update to upstream version 4.12
    
        
file modified
+1 -0
file removed
-33
file modified
+43 -61
file modified
+1 -1