1e66c68 Update to 1.2.0 upstream release

Authored and Committed by tomh 10 years ago
    Update to 1.2.0 upstream release
    
        
file modified
+1 -0
file modified
+20 -2
file modified
+10 -3
file modified
+1 -1