Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 13:32:55 +0000 (08:32 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 13:32:55 +0000 (08:32 -0500)
commit367bfcacaae232a54627c24707a6d8023ae2053e
treea686c1b7d09baf7454af64d7709c0d020bf48255
parent8915a7554c073a647b9f2579920e3b8e2d971b0a
parent7c691be10be57164d5338635245572801c8068b3
Merge branch 'master' of feistymeow.org:feisty_meow into dev

bring in the release from master