Merge branch 'jc/reflog-expire' into maint

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 8f40f4bf0df8bb8db58830e32d85964542d6cd6a..6cf11ce6481aa850f3b979b3feda04ae8f7cba48 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -247,7 +247,7 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>,
-Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.
+Junio C Hamano <gitster@pobox.com> and Chris Wright <chrisw@osdl.org>.
 
 Documentation
 --------------