846efc4 Fix changelog after merge

Authored and Committed by jgrulich 5 years ago
    Fix changelog after merge
    
        
file modified
+0 -3