]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2ae1c5 f5d1e1f)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:38:05 +0000 (14:38 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:38:05 +0000 (14:38 -0800)
The following commits were skipped:

f5d1e1f Backport NEWS typo fix
680ee61 Backport fix for bug#18745 from master.


Trivial merge