f44e8fe Rebase patches

Authored and Committed by mizdebsk 8 years ago
    Rebase patches
    
        
file modified
+5 -5
file modified
+2 -2
file modified
+1 -1
file modified
+14 -20
file modified
+1 -1