Merge from origin/emacs-25
commit870c56a0bd8fe51baa2efa20a75b848f2bd27fd4
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2016 22:43:25 +0000 (19 14:43 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2016 22:43:25 +0000 (19 14:43 -0800)
tree411a65a0f148e4df8ca1e43ce103c2d96badaccf
parent6a03b47f81c5a8f44d7bc524fce93d6f63dc4d08
parent07f45d77816c947d90e1c56d489a6b32bdacdda0
Merge from origin/emacs-25

07f45d7 ; Spelling fix
1a210f0 * admin/release-process: Update versions and blocking bug num...
36bafc9 Improve documentation of functions that accept time values

# Conflicts:
# admin/release-process
# src/editfns.c
doc/lispref/os.texi
src/editfns.c