Merge branch master into rorcz
commit6d5faa94d4e2f0c881da7170ce49931592aacc98
authorKyle J. McKay <mackyle@gmail.com>
Thu, 27 Oct 2016 20:05:47 +0000 (27 13:05 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Thu, 27 Oct 2016 20:05:47 +0000 (27 13:05 -0700)
tree86fec0b4ee03d6332e692932cd736bc056ae6ca0
parent97e49afa76ebe57483bbc8e4db5debe6e064e202
parentbee591a88057e8defcd1dc99beb5c0eb8a4cd211
Merge branch master into rorcz
Girocco/Config.pm
cgi/editproj.cgi
gitweb/gitweb_config.perl