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

diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index acd712b1cd75164acb78df38942aa1a35e4d80ca..5cc94ec53daf3057f57c993983d659543962abec 100644 (file)
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -46,7 +46,7 @@ OPTIONS
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
-and Junio C Hamano <junkio@cox.net>
+and Junio C Hamano <gitster@pobox.com>
 
 
 Documentation