; Merge from origin/emacs-25
commitfe3225830d0817d3d7eee1dfb92e0deec641c9c5
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:10:30 +0000 (5 14:10 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:10:30 +0000 (5 14:10 -0700)
treeda85c643cf8040db118538bf7705d2a461ec055a
parent0274862f395807d05585eb6325c5285f1bf775d8
parent3d981ddd5424ab6b166e6cfaf1842658311f8991
; Merge from origin/emacs-25

The following commit was skipped:

3d981dd Bump Emacs version to 25.1 for the first RC