Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:18:45 +0000 (17:18 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:18:45 +0000 (17:18 -0500)
commitb6bf58bb1afa4b6c468239087cf14ed7d121d2e3
treef8a21793f39ae531935f036405d34cb06639d8b5
parentbdb18173180307c7344265688563a2d466865e9c
parent130a17120755eef05b71014b7adf8f7c4def19fa
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

merging release