867fb52 Update to the latest git

Authored and Committed by mtasaka 7 years ago
    Update to the latest git
    
    - Switch to 1.2 branch
    
        
file modified
+1 -0
file modified
+8 -8
file modified
+1 -1