Merge from origin/emacs-24

The following commits were skipped:

8478885 Bump version to 24.5 for the release-candidate
118b6a9 (url-insert-file-contents): Set buffer-file-coding-system
This commit is contained in:
Paul Eggert 2015-03-29 14:14:37 -07:00
commit 97d44922da

Diff content is not available