92885b7 cleaning up changelog after merge from master

Authored and Committed by jhogarth 8 years ago
    cleaning up changelog after merge from master
    
        
file modified
+0 -3