Merge from origin/emacs-24
The following commit was skipped:
69204d5
# Changelog fixes (no need to merge to trunk)
This commit is contained in:
commit
e427b55370
The following commit was skipped:
69204d5
# Changelog fixes (no need to merge to trunk)