Merge branch 'sb/pack-protocol-mention-smart-http' into maint
commit68538cf9545ff853518b29fcac8e6bbe00a97f56
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:14 +0000 (25 11:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:14 +0000 (25 11:02 -0700)
tree093c3bbb4e4796e8019b3aeb0f4e32242d971e8f
parentf2bd231414fc9c22307971bcc6c5a3a96dec75c1
parent055c7e9fc64cfb1afa8952ce795fcf76514379ca
Merge branch 'sb/pack-protocol-mention-smart-http' into maint

Doc updates.

* sb/pack-protocol-mention-smart-http:
  Documentation/technical/pack-protocol: mention http as possible protocol
Documentation/technical/pack-protocol.txt