Merge branch 'jc/reflog-expire' into maint

diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt
index d21be41d0646c80e7ec9aeb1ed46ce617022e3cc..4fd7b5edf902e2e214975caaf743df79a8f987a6 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
 --------------