lisp/ChangeLog: Merge from emacs-24