modified:   CHANGELOG.md
Merge branch 'master' of https://github.com/abelardojarab/emacs