Merge git-gui 0.14.0

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index e1b7a0f9ec88deab1711d99293e23d4396a7bc0c..2c2ea12c5c4e19907674609c228997062d305983 100644 (file)
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -1350,14 +1350,6 @@ operator can use this facility to peek at the objects and refs from an
 import in progress, at the cost of some added running time and worse
 compression.
 
-Author
-------
-Written by Shawn O. Pearce <spearce@spearce.org>.
-
-Documentation
---------------
-Documentation by Shawn O. Pearce <spearce@spearce.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite