; Merge from origin/emacs-25
commitb0eecfca560737787496ba3294bc7605a0922a2a
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2016 19:50:31 +0000 (25 12:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2016 19:50:31 +0000 (25 12:50 -0700)
treea8973cca6836e72ed2d0e36ba5242c02ff220fdf
parentf8eecb1c6c8a3646d65112843c7f813fe639d57f
parent32827b374da7b085fc8a45bd35bf57a1afa325f9
; Merge from origin/emacs-25

The following commit was skipped:

32827b3 Default REL_ALLOC to 'no'