From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 Mar 2015 01:48:18 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~195
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e427b55370b28f55e285ce0ee4328246eb7522ea;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

69204d5 # Changelog fixes (no need to merge to trunk)
---

e427b55370b28f55e285ce0ee4328246eb7522ea