Merge from origin/emacs-24

The following commit was skipped:

780eb0a Auto-commit of loaddefs files.
This commit is contained in:
Fabián Ezequiel Gallina 2015-01-28 00:33:03 -03:00
commit 4fc35edd5f

Diff content is not available