; Merge from origin/emacs-25
commitbb9924128397d072c6997de1f0b77ee8ae671e0e
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:24:51 +0000 (19 12:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:24:51 +0000 (19 12:24 -0700)
treeba0111024dbfb91bfb1aab36c5648255fbf81452
parent0d112c00ba0ec14bd3014efcd3430b9ddcfe1fc1
parent5a1908fbdd80f20b1e4abb980d140ffaba91b916
; Merge from origin/emacs-25

The following commit was skipped:

5a1908f ; Auto-commit of loaddefs files.