Merge branch 'jk/utf-8-can-be-spelled-differently' into next
commit18ebb43461d0b38253e2dde7b215fabf4804acad
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:07 +0000 (19 15:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:07 +0000 (19 15:57 -0700)
tree04df2f6cefc56d772035708836c6783225395283
parentbd54c7a8e267a6f3fe986639e22f85aecefc57e1
parent5c680be113ec8aca49ddfbe93a9f43684d3d261e
Merge branch 'jk/utf-8-can-be-spelled-differently' into next

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