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

Merge from origin/emacs-24

The following commit was skipped:

15d78a2 # Auto-commit of loaddefs files.
---

518eab2f7db71929e4877daa5ebd06b1416e69e6