372d5ee Rebased to version 1.2.0

Authored and Committed by crobinso 8 years ago
    Rebased to version 1.2.0
    
        
file modified
+1 -1
file modified
+7 -9