]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a660037 a4ff05a)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Mar 2015 17:17:43 +0000 (10:17 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Mar 2015 17:17:43 +0000 (10:17 -0700)
The following commit was skipped:

a4ff05a ChangeLog fix No need to merge to trunk, since it corrects a backported entry that should not appear in trunk.


Trivial merge