cc274ad Update to upstream version 1.2

Authored and Committed by Nikola Dipanov 8 years ago
    Update to upstream version 1.2
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1