Merge branch 'maint' into bc/master-diff-hunk-header-fix

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 14e10362b164379bb8fb7eb4e7925f916bea0c12..d3f258869f5d441bea16b46d8030eb64ecb7df99 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -182,7 +182,7 @@ topologically related with each other.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 
 Documentation