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)
* rr/git-uri-doc:
Git url doc: mark ftp/ftps as read-only and deprecate them

Trivial merge