]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Mar 2015 17:14:19 +0000 (10:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Mar 2015 17:15:22 +0000 (10:15 -0700)
e72edc0 Fix lisp/ChangeLog entry from last commit.

Conflicts:
lisp/ChangeLog


Trivial merge