Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

1 files changed, 11 insertions, 1 deletions

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 753a676e81a..1a4157ac53e 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -61,7 +61,7 @@ Michael Albinus
             lisp/net/tramp*.el
             lisp/url/url-tramp.el
             doc/misc/tramp*.texi
-            test/lisp/net/tramp-tests.el
+            test/lisp/net/tramp*-tests.el
             test/lisp/url/url-tramp-tests.el
 
         D-Bus
@@ -210,11 +210,21 @@ Paul Eggert
 Michael Albinus
         src/inotify.c
         lisp/autorevert.el
+        lisp/files.el (file-name-non-special)
         lisp/eshell/em-tramp.el
+        lisp/net/ange-ftp.el
         lisp/notifications.el
+        lisp/shadowfile.el
         test/lisp/autorevert-tests.el
+        test/lisp/files-tests.el (file-name-non-special)
+        test/lisp/shadowfile-tests.el
         test/src/inotify-test.el
 
+        Secret Service API in
+            lisp/auth-source.el
+            doc/misc/auth.texi
+            test/lisp/auth-source-tests.el
+
 Nicolas Petton
         lisp/emacs-lisp/subr-x.el
         lisp/arc-mode.el