]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 15 Jan 2018 21:53:40 +0000 (13:53 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 15 Jan 2018 21:53:40 +0000 (13:53 -0800)
The following commits were skipped:

7a81586bd7 Fix Bug#29149 in dired-aux.el
9b2c3c190a Fix Bug#29149 in shell.el


Trivial merge