Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 07:43:34 +0000 (07:43 +0000)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 07:43:34 +0000 (07:43 +0000)
commitfdcfc633582d7491e7af348ae3b023c5ee83de0b
treed5c69b5dcc4a17b8361ecf45baa9e9af76f2e844
parent381d26a6429eeac1a17224388d6b4e0c24667576
parentdfcad3035428a91911dd9f4c3abb028eed3a8fb6
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

bringing in the newest changes.