Merge branch 'jz/gitweb-conf-doc-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:22 +0000 (12:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:22 +0000 (12:12 -0700)
Documentation update.

* jz/gitweb-conf-doc-fix:
gitweb.conf.txt: say "build-time", not "built-time"

1  2 
Documentation/gitweb.conf.txt
Simple merge