master 66e50562e8 2/3: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit 66e50562e818ae181f98f139e07bd56d0d6aadb3
Merge: ca25fde951 b4e709c41f
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 admin/MAINTAINERS | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 33aeb52865..f0a3c22059 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -58,10 +58,7 @@ Artur Malabarba
 
 Michael Albinus
         Tramp
-            lisp/net/tramp*.el
             lisp/url/url-tramp.el
-            doc/misc/tramp*.texi
-            test/lisp/net/tramp*-tests.el
             test/lisp/url/url-tramp-tests.el
 
         D-Bus
@@ -270,6 +267,20 @@ Amin Bandali
            lisp/eshell/*
            doc/misc/eshell.texi
 
+==============================================================================
+3. Externally maintained packages.
+==============================================================================
+
+Tramp
+       Maintainer: Michael Albinus
+       Repository: git://git.savannah.gnu.org/tramp.git
+       Mailing List: tramp-devel@gnu.org
+       Bug Reports: M-x tramp-bug
+
+        lisp/net/tramp*.el
+        doc/misc/tramp*.texi
+        test/lisp/net/tramp*-tests.el
+
 
 ;;; Local Variables:
 ;;;   coding: utf-8