Merge branch 'ye/doc-http-proto' into maint
commit1a1f7b2c522814a251b77cb7dd7b0ee2e7410f88
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:28:02 +0000 (22 10:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:28:02 +0000 (22 10:28 -0700)
treed78da530f45cce29432a57770eda25b0428ce213
parent0196a605f742580f53250bddf82b355a1018d9be
parent04953bc888e648dc22c172ffa74de1b2a08a209a
Merge branch 'ye/doc-http-proto' into maint

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