f67751a Rebase to 1.2.0

Authored and Committed by Tomas Heinrich 10 years ago
    Rebase to 1.2.0
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1