f4a14f7 Update to 2.0.0 upstream release

Authored and Committed by tomh 8 years ago
    Update to 2.0.0 upstream release
    
        
file modified
+2 -0
file modified
+1 -1
file modified
+11 -5
file modified
+2 -2