Merge branch 'jk/utf-8-can-be-spelled-differently'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:58 +0000 (14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:58 +0000 (14:02 -0700)
Some platforms and users spell UTF-8 differently; retry with the
most official "UTF-8" when the system does not understand the
user-supplied encoding name that are the common alternative
spellings of UTF-8.

* jk/utf-8-can-be-spelled-differently:
utf8: accept alternate spellings of UTF-8

1  2 
utf8.c
diff --cc utf8.c
Simple merge