Merge branch 'master' into rorcz
commit86a70763abc0b9769daaa57232dc4ae0a3def6db
authorKyle J. McKay <mackyle@gmail.com>
Thu, 25 Dec 2014 02:07:13 +0000 (24 18:07 -0800)
committerKyle J. McKay <mackyle@gmail.com>
Thu, 25 Dec 2014 02:07:13 +0000 (24 18:07 -0800)
tree5923dd22d35a25a53dba713c47592a221260cfed
parent575556c93f8450c99b879629eb3f181c4235f603
parente5f0bb683b426cf9a8d9d81020bf7491e65ff4ce
Merge branch 'master' into rorcz
Girocco/Config.pm
cron/girocco
jobd/update.sh