70f6c71 update to upstream 1.2.0 release

Authored and Committed by root 13 years ago
    update to upstream 1.2.0 release
    
        
file modified
+1 -0
file modified
+7 -6
file modified
+1 -1