Merge branch 'maint'

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 7508c0e42d2cd50ac522fc80a3a866411b7b51c5..10509cc450d47de35387a547cb79e30177f6304c 100644 (file)
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -23,14 +23,6 @@ OPTIONS
 <stream>::
        Byte stream to act on.
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite