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

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index 53a9ce308541c73b6a0fc880d699ed7bed1817cb..c8611632d1d501d57eb7000de0ec3c3b36810b80 100644 (file)
--- a/Documentation/git-verify-pack.txt
+++ b/Documentation/git-verify-pack.txt
@@ -42,7 +42,7 @@ for objects that are deltified.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------