0640ca6 Rebase to v1.2.15

Authored and Committed by rsroka 6 years ago
    Rebase to v1.2.15
    
    - fixed CVE-2018-1000140
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1