Merge from origin/emacs-24

The following commit was skipped:

a4ff05a ChangeLog fix No need to merge to trunk, since it corrects a backported entry that should not appear in trunk.
This commit is contained in:
Paul Eggert 2015-03-23 10:17:43 -07:00
commit 7f55d42518

Diff content is not available