Merge branch 'testing' into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 17:53:21 +0000 (12:53 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 17:53:21 +0000 (12:53 -0500)
commit8f403891425dfe131948be97cae4edf21f3f7869
tree22302a674042366f6972529b0ff2c2b29a786064
parenta4d12589f1cd01826814842cde0b3eac95890bc9
parentf4bb3f48ffeba729acf2a15c89bf95b952b24e43
Merge branch 'testing' into dev

tasty updates from testing branch--best stuff is the archiver script mods