Merge branch 'ye/http-extract-charset'
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:53:05 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:53:05 +0000 (12:53 -0700)
* ye/http-extract-charset:
http: fix charset detection of extract_content_type()

Trivial merge