; Merge from origin/emacs-25
commit4dad9675c58ea82f6d2f8ec8dfa10d67d754d1d1
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 20:35:57 +0000 (26 13:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 20:35:57 +0000 (26 13:35 -0700)
tree6065ab2578cfdd73012045e8911a065ab9e0fe0c
parentfffa49b136b02052073fa584cf7b9fe99b1bf951
parent0d016ca1164463320a77482df88ef81cc34056d1
; Merge from origin/emacs-25

The following commit was skipped:

0d016ca Increment Emacs version to 25.1.50