Merge from origin/emacs-24
The following commit was skipped:
babb0ca
ChangeLog fix (do not merge to master)
This commit is contained in:
commit
0c3f76c633
The following commit was skipped:
babb0ca
ChangeLog fix (do not merge to master)