Merge branch 'rr/git-uri-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:28:56 +0000 (10:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:28:56 +0000 (10:28 -0700)
commit5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a
tree2f213c41ad325abd85bb91aa21cd48825c4b2051
parentc15fadab65907e7fa1ae3a0dd5e05b722fd1f235
parent6347e71619999481139862ac06f0f295ecf98658
Merge branch 'rr/git-uri-doc' into maint

* rr/git-uri-doc:
  Git url doc: mark ftp/ftps as read-only and deprecate them