Merge branch 'jn/gitweb-js-blame' into next

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 66943fdf83ff6dbbf6de4be98e90c764389565a9..9c750e24446b58efc2bd8d5e44566d060eaa353a 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -154,14 +154,6 @@ SEE ALSO
 --------
 linkgit:gitattributes[5]
 
-Author
-------
-Written by Franck Bui-Huu and Rene Scharfe.
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite