Merge branch 'ss/help-htmlpath-config-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:13:31 +0000 (28 11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:13:31 +0000 (28 11:13 -0800)
* ss/help-htmlpath-config-doc:
  config.txt: Document help.htmlpath config parameter

1  2 
Documentation/config.txt

Simple merge