Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 17 Nov 2017 22:48:22 +0000 (17:48 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 17 Nov 2017 22:48:22 +0000 (17:48 -0500)
commitbaed4084d174d297d86b6224c0ee608bfba8184a
tree0bbcb6a38f374ad5bfc6f423b13928f86a97d3a4
parent28784b1e4c0fb4f0c0b655ac8382bc35b644eb4c
parent819f050b9cdc3d976afae72a247aae8394018284
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
scripts/site_avenger/revamp_cakelampvm.sh
scripts/system/common_sysadmin.sh