8445c5b merge changelog

Merged and Committed by raphgro 7 years ago
    merge changelog
    
        
file modified
+3 -0