Merge branch 'jz/gitweb-conf-doc-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 17:34:01 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 17:34:01 +0000 (10:34 -0700)
* jz/gitweb-conf-doc-fix:
  gitweb.conf.txt: say "build-time", not "built-time"

1  2 
Documentation/gitweb.conf.txt

Simple merge