09f7b2c Fix accidentally corrupted changelog merge

Authored and Committed by ngompa 5 years ago
1 file changed. 11 lines added. 4 lines removed.
    Fix accidentally corrupted changelog merge
    
        
file modified
+11 -4