Merge branch 'rr/git-uri-doc'
commitc5fe239860cc7afcae33c78307896be8c754517e
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Oct 2012 21:57:26 +0000 (10 14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Oct 2012 21:57:26 +0000 (10 14:57 -0700)
tree391a525782adbf3efa055c72251b8c6b9475a248
parentb7804cf2277af57785ca0a1686bf6571e711a9ca
parent6347e71619999481139862ac06f0f295ecf98658
Merge branch 'rr/git-uri-doc'

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