Merge branch 'ye/http-extract-charset' into next
commit9492baed15da6ca6503e675694794fa5dfea2496
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:39:32 +0000 (20 13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:39:32 +0000 (20 13:39 -0700)
tree311ccbafd00f854cc4e421b5c39d7a9570c448a2
parent24f347d3f6024e8b290c1c8a0fd56e75a011008d
parentf34a655d4d1e25f314cd5760e2a39bec28950aa1
Merge branch 'ye/http-extract-charset' into next

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