Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:12 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:12 +0000 (14:38 -0700)
* nd/urls-doc-no-file-hyperlink-fix:
urls.txt: avoid auto converting to hyperlink

Trivial merge