Merge branch 'master' into rorcz
commit8562082e9013b29f6608075361a122557805619f
authorKyle J. McKay <mackyle@gmail.com>
Wed, 29 Apr 2015 00:43:57 +0000 (28 17:43 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Wed, 29 Apr 2015 00:43:57 +0000 (28 17:43 -0700)
tree39c912bf181cffa64c01970630599453c7bacd68
parent16060f917c0d4d45f3986b0f732c51275afa8228
parented7c8ccada2458fa6986e7aad1dbac115887f8ca
Merge branch 'master' into rorcz
Girocco/Config.pm
cron/girocco
gitweb/gitweb_config.perl
htaccess
jobd/update.sh