Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 20:48:51 +0000 (15:48 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 20:48:51 +0000 (15:48 -0500)
commitafff950f497547f99b9df6287c6227868b5cfa3f
tree74fbd698af2b972930228e18b35e06ab58a8bfb8
parentbcad991077315559548504a731a60a552fe3b3ea
parent353de63d1822c0ac3d3e7cb25c8619d1977091ba
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

grabbing dev mainline