723bf2c Rebase to upstream 2.2.0 verison, drop upstreamed patches

Authored and Committed by Tomas Smetana 2 years ago
    Rebase to upstream 2.2.0 verison, drop upstreamed patches
    
        
file modified
+1 -0
file modified
+9 -9
file modified
+1 -1