tree 391a525782adbf3efa055c72251b8c6b9475a248
parent b7804cf2277af57785ca0a1686bf6571e711a9ca
parent 6347e71619999481139862ac06f0f295ecf98658
author Junio C Hamano <gitster@pobox.com> 1349906246 -0700
committer Junio C Hamano <gitster@pobox.com> 1349906246 -0700

Merge branch 'rr/git-uri-doc'

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