Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double...
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Dec 2017 17:20:12 +0000 (09:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Dec 2017 17:20:12 +0000 (09:20 -0800)
* 'ls/no-double-utf8-author-name' of ../git-gui:
  git-gui: prevent double UTF-8 conversion

1  2 
git-gui/lib/commit.tcl

Simple merge