81300da Update to upstream 1.2.1 release

Authored and Committed by encukou 9 years ago
    Update to upstream 1.2.1 release
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1