Merge from origin/emacs-24

The following commit was skipped:

babb0ca ChangeLog fix (do not merge to master)
This commit is contained in:
Stefan Monnier 2014-12-05 15:12:00 -05:00
commit 0c3f76c633

Diff content is not available