tree b06ca1b54d971308931f683eacd4012bc8afcc2e
parent 6d7c1c88940320c2ccde9d996181826a38ff7a81
parent b1f809d0aecd9b0853d728dbc3d4c4e44e235785
author Junio C Hamano <gitster@pobox.com> 1359400411 -0800
committer Junio C Hamano <gitster@pobox.com> 1359400411 -0800

Merge branch 'ss/help-htmlpath-config-doc' into maint

* ss/help-htmlpath-config-doc:
  config.txt: Document help.htmlpath config parameter