f11f6d1 Update to 4.2.0 upstream release

Authored and Committed by tomh 8 years ago
    Update to 4.2.0 upstream release
    
        
file modified
+1 -0
file modified
+12 -3
file modified
+1 -1