Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt
index bc1207a317b9c1e93ba35c5a9e82a5e243b4a42e..35d27b0c7f0e4b7a1d0851140958e71fabb0e6bc 100644 (file)
--- a/Documentation/git-update-server-info.txt
+++ b/Documentation/git-update-server-info.txt
@@ -47,7 +47,7 @@ info/refs file unless `--force` flag is given.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------