Merge branch 'master' into rorcz
commita3e5670deefcc37b10215bbd18b59d0c12656257
authorKyle J. McKay <mackyle@gmail.com>
Sat, 27 Sep 2014 07:14:20 +0000 (27 00:14 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Sat, 27 Sep 2014 07:14:20 +0000 (27 00:14 -0700)
tree6e877b3b23bee590e88924c4a54c15b38ffe3555
parentc6d9bc2cd8ee22250e755513a7eea5306af95b99
parent57adc03c810bedd39ed49b545e7d02525045704e
Merge branch 'master' into rorcz
jobd/update.sh