Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 1dd134538da40a1f3547c55c49be3b418e6be0ab..dc8a96adb00c0b674e12e071a4a56f89bfe8583d 100644 (file)
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -18,7 +18,7 @@ to resolve a merge after the trivial merge done with 'git-read-tree -m'.
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>,
-Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
+Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
 
 Documentation
 --------------