dce12f9 rebase to new version

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