Merge branch 'bc/old-iconv' into next
commit1a91a56e273baa63ffe45263d0fe0c0d703bb8b5
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 May 2009 02:20:02 +0000 (20 19:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 May 2009 02:20:02 +0000 (20 19:20 -0700)
tree7a40220bed55b6445e5e1c99c496bce317443138
parentbc70c33fb40ad49eef7b68a00ee6411dca71e815
parentbf1db7dba50205905cb27ff73586ae3a44b89bca
Merge branch 'bc/old-iconv' into next

* bc/old-iconv:
  t5100: use ancient encoding syntax for backwards compatibility
  t9301: use ISO8859-1 rather than ISO-8859-1
  t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility
  t3901: avoid negation on right hand side of '|'
  builtin-mailinfo.c: use "ISO8859-1" instead of "latin1" as fallback encoding
  builtin-mailinfo.c: compare character encodings case insensitively
  Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility
  t3900: use ancient iconv names for backward compatibility
builtin-log.c