Merge branch 'maint'

diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index 7477ce8fa8e5185cfbd74a31b8d5accd18216a1b..08f85ba046598070432e9d9cd45052ae20484402 100644 (file)
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@ -84,14 +84,6 @@ If the configuration variable 'instaweb.browser' is not set,
 'web.browser' will be used instead if it is defined. See
 linkgit:git-web{litdd}browse[1] for more information about this.
 
-Author
-------
-Written by Eric Wong <normalperson@yhbt.net>
-
-Documentation
---------------
-Documentation by Eric Wong <normalperson@yhbt.net>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite