73b31f0 Rebase patches

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