e28b6a6 Update to upstream 2.0.0

Authored and Committed by Alan Pevec 8 years ago
    Update to upstream 2.0.0
    
        
file modified
+1 -0
file modified
+5 -6
file modified
+1 -1