Merge branch 'ye/doc-http-proto' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:39:29 +0000 (13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:39:29 +0000 (13:39 -0700)
commit24f347d3f6024e8b290c1c8a0fd56e75a011008d
treed05cca340beaed665addf2fd9eb9e13df1b2be4c
parent01f81f5078e5435cf0bbc438f78b985b34310be4
parent04953bc888e648dc22c172ffa74de1b2a08a209a
Merge branch 'ye/doc-http-proto' into next

* ye/doc-http-proto:
  http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
Documentation/technical/http-protocol.txt