From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 23 Mar 2015 17:14:19 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~95
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=325c5543035b411ae79839dda47bbbbde838d36b;p=emacs.git

Merge from origin/emacs-24

e72edc0 Fix lisp/ChangeLog entry from last commit.

Conflicts:
	lisp/ChangeLog
---

325c5543035b411ae79839dda47bbbbde838d36b