Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
commitee493663ba6571a5cb47c51e68aae679d94ee1f0
authorEli Zaretskii <eliz@gnu.org>
Mon, 30 Oct 2017 18:47:06 +0000 (30 20:47 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 30 Oct 2017 18:47:06 +0000 (30 20:47 +0200)
tree7cde323dd70be16de99d98cbddb01918e490dc52
parentca5eb0d0b77579d10be160a6e2c7a0dce2e4fbbd
parentd10c9479ca4d873a8bd09bb63ae865b4a953d5c8
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26