Merge from origin/emacs-24

The following commit was skipped:

69204d5 # Changelog fixes (no need to merge to trunk)
This commit is contained in:
Paul Eggert 2015-03-08 18:48:18 -07:00
commit e427b55370

Diff content is not available