Merge branch 'jc/reflog-expire' into maint

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 4dafa39a9211d9d35498f4c88418713b1aa33284..ee27eff3b1139f54784876cac0a61d6b6383f37e 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -235,7 +235,7 @@ linkgit:git-am[1], linkgit:git-send-email[1]
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------