61394a0 merge changelog

Merged and Committed by raphgro 8 years ago
    merge changelog
    
        
file modified
+9 -3