4c7bdc4 Rebase to new version

Authored and Committed by humaton 8 years ago
    Rebase to new version
    
        
file modified
+1 -0
file modified
+8 -3
file modified
+1 -1