Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
commit33401b26b1aecf61adfd77fa7c4e29913c0bb3d7
authorEli Zaretskii <eliz@gnu.org>
Fri, 29 Sep 2017 10:24:05 +0000 (29 13:24 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 29 Sep 2017 10:24:05 +0000 (29 13:24 +0300)
tree0238b3a9e51c4a37f8fe35feb11a66baeb2d1f3d
parentc1ac8c170f17a98b7e5d6e098f707daeb71ea27d
parentd4b2bbdc73ace5cb0971a32a75941486489d1cc5
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26