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

* nd/urls-doc-no-file-hyperlink-fix:
  urls.txt: avoid auto converting to hyperlink