2fd59fc rebase to new version

Authored and Committed by jvcelak 8 years ago
    rebase to new version
    
        
file modified
+4 -1
file modified
+1 -1