38012ff Update to upstream 1.2.0 release

Authored and Committed by Jared K. Smith 8 years ago
    Update to upstream 1.2.0 release
    
        
file modified
+3 -0
file modified
+34 -24
file modified
+3 -1