Merge branch master into rorcz
commit97e49afa76ebe57483bbc8e4db5debe6e064e202
authorKyle J. McKay <mackyle@gmail.com>
Sun, 9 Oct 2016 09:26:42 +0000 (9 02:26 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Sun, 9 Oct 2016 09:26:42 +0000 (9 02:26 -0700)
tree1ef23cd0b0807c802fb6758295e8f7ee1ee38f7b
parentefd33565cf38973e8abc8dcd180f60710cfc7eb1
parent38fd53a1ad4aae0cff9f2bc9cc25b6032506bccd
Merge branch master into rorcz
Girocco/Config.pm
apache.conf.in
jobd/update.sh