d9643ec Update to upstream version 2.0

Authored and Committed by msimacek 9 years ago
    Update to upstream version 2.0
    
        
file modified
+1 -0
file modified
+46 -21
file modified
+1 -1