Merge branch 'ye/doc-http-proto' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:28:02 +0000 (10:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:28:02 +0000 (10:28 -0700)
* ye/doc-http-proto:
http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

Trivial merge