Merge git-gui 0.14.0

diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 4d673a56864ca88de0e98f54a6de469e99ea0f44..f616a739efdab16a58c33e9c2671e8afbaf13b98 100644 (file)
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -78,14 +78,6 @@ linkgit:git-fsck[1],
 linkgit:git-gc[1],
 linkgit:git-reflog[1]
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite