Merge git://repo.or.cz/git-gui

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 50fb3d5d545351ce5caf1576f529dc537d8353da..837fb08b7971a8b948dd7d039bab4a3c2e54cac7 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -74,7 +74,7 @@ effect to your index in a row.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------