Merge from origin/emacs-24
e72edc0
Fix lisp/ChangeLog entry from last commit.
Conflicts:
lisp/ChangeLog
This commit is contained in:
commit
325c554303
e72edc0
Fix lisp/ChangeLog entry from last commit.
Conflicts:
lisp/ChangeLog