tree 2f213c41ad325abd85bb91aa21cd48825c4b2051
parent c15fadab65907e7fa1ae3a0dd5e05b722fd1f235
parent 6347e71619999481139862ac06f0f295ecf98658
author Junio C Hamano <gitster@pobox.com> 1350494936 -0700
committer Junio C Hamano <gitster@pobox.com> 1350494936 -0700

Merge branch 'rr/git-uri-doc' into maint

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