Merge branch 'cc/bisect' (early part)

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index 4f252441ed6a5fb0348012e76134aad3d3ddde65..abe7bf9ff9eb9a3ddb1924938de071291520797a 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -69,7 +69,7 @@ EXAMPLES
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 GIT
 ---