Merge branch 'ye/http-extract-charset'
commita02ad882a17b9d45f63ea448391ac5e9f7948222
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:53:05 +0000 (2 12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:53:05 +0000 (2 12:53 -0700)
tree4c48e769c8f8556a24f10db4a892889d154623b0
parent6293aea559b6c8f224f748e5a2a641ddb6cca55a
parentf34a655d4d1e25f314cd5760e2a39bec28950aa1
Merge branch 'ye/http-extract-charset'

* ye/http-extract-charset:
  http: fix charset detection of extract_content_type()