Merge from origin/emacs-24

e72edc0 Fix lisp/ChangeLog entry from last commit.

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Paul Eggert 2015-03-23 10:14:19 -07:00
commit 325c554303

Diff content is not available