master 2f08c85d52 2/2: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 2f08c85d52fb1b7ef92a97bcc93a1997b4d02384
Merge: 1afccbe71c 50bb9ec84c
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-28
    
    50bb9ec84c ; * admin/admin.el (make-news-html-file): Fix typo.
---
 admin/admin.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/admin.el b/admin/admin.el
index 247bbd5f4e..6a67f172e2 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -963,7 +963,7 @@ $Date: %s $
             (format admin--org-html-postamble
                     copyright-years
                     ;; e.g. "2022/09/13 09:13:13"
-                    (format-time-string "%Y/%M/%y %H:%m:%S")))
+                    (format-time-string "%Y/%m/%d %H:%m:%S")))
            (org-html-mathjax-template "")
            (htmlize-output-type 'css))
       (org-html-export-as-html))