Merge branch 'master' into rorcz
commit9dd78d0775d5952106355374d67f3d1abd2380ed
authorKyle J. McKay <mackyle@gmail.com>
Tue, 3 Feb 2015 21:03:08 +0000 (3 13:03 -0800)
committerKyle J. McKay <mackyle@gmail.com>
Tue, 3 Feb 2015 21:03:08 +0000 (3 13:03 -0800)
treefcbf126b5dfa3e705606d5a38d7cc12cc8a80f55
parent86d3f487b938890b64bb3e77932e3433d4ac0866
parentb9053929c38caef7860aeeb29befad10beb7b855
Merge branch 'master' into rorcz
Girocco/Config.pm
jobd/update.sh