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

1 files changed, 2 insertions, 0 deletions

diff --git a/admin/authors.el b/admin/authors.el
index 198a8e4d260..fe1b26ffbe6 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -855,6 +855,7 @@ in the repository.")
     ("emacs-lisp/assoc.el" . "assoc.el")
     ("emacs-lisp/cust-print.el" . "cust-print.el")
     ("emacs-lisp/gulp.el" . "gulp.el")
+    ("lisp/abbrevlist.el" . "abbrevlist.el")
     ("emulation/crisp.el" . "crisp.el")
     ("emulation/tpu-edt.el" . "tpu-edt.el")
     ("emulation/tpu-extras.el" . "tpu-extras.el")
@@ -865,6 +866,7 @@ in the repository.")
     ("mail/mailpost.el" . "mailpost.el")
     ("net/eudcb-ph.el" . "eudcb-ph.el")
     ("play/bruce.el" . "bruce.el")
+    ("play/landmark.el" . "landmark.el")
     ("lisp/play/landmark.el" . "landmark.el")
     ("play/yow.el" . "yow.el")
     ("patcomp.el" . "patcomp.el")