Merge from origin/emacs-24
commit0d7b2c96d388f5a9b539df3cb7f4ef115e7010b7
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 5 Dec 2014 20:22:15 +0000 (5 15:22 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 5 Dec 2014 20:22:15 +0000 (5 15:22 -0500)
treeee26e3194caf1e854c2f5844aa772ae4bafaa314
parentfca389d1d3253c58e198efaa28d175106ce5022a
parentf9f250920b3e76470a496db194cbbdcf62865430
Merge from origin/emacs-24

The following commit was skipped:

f9f2509 Auto-commit of loaddefs files.