Merge branch 'jk/utf-8-can-be-spelled-differently' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:43:25 +0000 (12:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:43:25 +0000 (12:43 -0700)
commitd7cccbb3bb706b6a9eb13120e354a8487b4b3cfe
treed37ed5fcab7225fab97ab6e5e2096f54c1b50419
parent307d68e275d21b7e54d464f1e372b33e9444fef2
parent5c680be113ec8aca49ddfbe93a9f43684d3d261e
Merge branch 'jk/utf-8-can-be-spelled-differently' into maint

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