4826365 Rebase the patch

Authored and Committed by Dan Vrátil 8 years ago
    Rebase the patch
    
        
file removed
-14
file modified
+1 -1