Merge branch master into rorcz
commit2e75277a55be71759d976b2bb1dfd7fdab1d601e
authorKyle J. McKay <mackyle@gmail.com>
Fri, 18 Sep 2015 16:58:04 +0000 (18 09:58 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Fri, 18 Sep 2015 16:58:04 +0000 (18 09:58 -0700)
tree674bd27f15d45115c5a48ff39b61490017ccdcaf
parent08e19bb05b7515afbc39b5ad99d267694aa3f454
parentfaa69f1c2c4d5e91059b78c3e41084956289693b
Merge branch master into rorcz
Girocco/Config.pm
apache.conf.in
gitweb/gitweb_config.perl
gitweb/indextext.html