From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 29 Mar 2015 21:14:37 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97d44922da3c22b3973f95892bfa2ee4afc0ceac;p=emacs.git

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
---

97d44922da3c22b3973f95892bfa2ee4afc0ceac