Merge branch 'maint'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 4d37de639dd6f6deaf2c52231c0ae879cd30f23d..6b1b5af64e2daec1ecc8ee832f58f5186d740a79 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -189,15 +189,6 @@ SEE ALSO
 --------
 linkgit:git-apply[1].
 
-
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
-Documentation
---------------
-Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite