Merge branch master into rorczrorcz
commitf1c5644cb8e9f5eff04a91f38f0e3025f8ba3d42
authorKyle J. McKay <mackyle@gmail.com>
Wed, 24 Aug 2016 22:25:10 +0000 (24 15:25 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Wed, 24 Aug 2016 22:25:10 +0000 (24 15:25 -0700)
tree3c2851ad8757b7e3d3252b1722cc692a5404548b
parent3167073002c7b830a413474e9622d95c1884cf60
parentf004b4b5a4f94032664ec66f9eb55cd58d0994ec
Merge branch master into rorcz
Girocco/Config.pm
jobd/update.sh