Merge branch 'ye/doc-http-proto'
commitccca6b6523d7071cd0ee09fd00ea3e05d4b8e3eb
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:23:52 +0000 (25 12:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:23:52 +0000 (25 12:23 -0700)
tree677faa2b5acbe6fe7ecaf8db4b3b0f1822ad4566
parent8d87e35babb0f9d8657ef530dd9d77eed0bfec9a
parent04953bc888e648dc22c172ffa74de1b2a08a209a
Merge branch 'ye/doc-http-proto'

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