Merge branch 'tr/rev-list-docs' into tr/filter-branch

diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index c069cc8b04a63084856b60814669457c95dac2db..75a8da1ca906aee4cc6a7d0c3ff19862b8e0fc2f 100644 (file)
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -27,7 +27,7 @@ OPTIONS
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------