0a81a06 Update to upstream version 2.0-M2

Authored and Committed by mizdebsk 9 years ago
    Update to upstream version 2.0-M2
    
        
file modified
+1 -0
file modified
+20 -76
file modified
+1 -1