From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Oct 2012 17:28:56 +0000 (-0700)
Subject: Merge branch 'rr/git-uri-doc' into maint
X-Git-Tag: v1.7.12.4~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a;p=git.git

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

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

5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a