From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 3 Mar 2015 22:38:05 +0000 (-0800)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~237
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1fb87f1f1aa0947ec7b572a0ec1677c18aefc9f0;p=emacs.git

Merge from origin/emacs-24

The following commits were skipped:

f5d1e1f Backport NEWS typo fix
680ee61 Backport fix for bug#18745 from master.
---

1fb87f1f1aa0947ec7b572a0ec1677c18aefc9f0