Merge branch 'maint'

diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index 146d7f545cb2f85177c8143b7e7b999ae8303d71..d99236e14d5238c936304029bd48efc6ac9dd024 100644 (file)
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -94,7 +94,7 @@ them.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------