Merge from origin/emacs-25
commitc26605861eab8499288dc83e3d80fd0e505b40fc
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:36:38 +0000 (7 12:36 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:36:38 +0000 (7 12:36 -0800)
tree24241eccc24d9159bded0c06a5a84b25dadbd328
parent4ab7c308e073aa26973c5cdd17ec44bf5b325b57
parent3d63b488da6229bf85d28022f2b55ea6341d1805
Merge from origin/emacs-25

3d63b48 Update ChangeLog files and authors.el
9d30264 Fix menu bindings of Dired 'A' and 'Q' commands
a725592 Avoid errors in shr-pixel-column due to dedicated windows
3138598 Update format-time-string documentation
ChangeLog.2
doc/lispref/os.texi
lisp/dired.el
lisp/net/shr.el