Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 22:22:54 +0000 (17:22 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 22:22:54 +0000 (17:22 -0500)
commitcab61d94944c5aaf989114d573ab77a68d873cd6
tree1f734748a14f2f7ce659a848832b46d93dd14902
parenta11f57c3165a533404886d13e2560812000b44cb
parentae0bd8ed7104f74dfa8b48f49b5bc7e7b490f82e
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

merging