Merge branch 'master' into rorczrorcz
authorKyle J. McKay <mackyle@gmail.com>
Thu, 23 Jul 2015 09:13:46 +0000 (23 02:13 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Thu, 23 Jul 2015 09:13:46 +0000 (23 02:13 -0700)
1  2 
Girocco/Config.pm
jobd/jobd.pl
jobd/update.sh

Simple merge
diff --cc jobd/jobd.pl
Simple merge
diff --cc jobd/update.sh
Simple merge