Merge branch 'jk/utf-8-can-be-spelled-differently'
commit31b12a1999968b54ff3f251d4e939e7ecf662711
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:58 +0000 (21 14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:58 +0000 (21 14:02 -0700)
treeb407335a16a667507148f973c4093bbdb1bc5e87
parent0f6875dbe2598fd2e9a597a9e42cde4a507140dd
parent5c680be113ec8aca49ddfbe93a9f43684d3d261e
Merge branch 'jk/utf-8-can-be-spelled-differently'

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
utf8.c