Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:20:38 +0000 (22:20 +0000)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:20:38 +0000 (22:20 +0000)
commita9311019fd8802416644421ca85e7537190127a8
treef8a21793f39ae531935f036405d34cb06639d8b5
parent130a17120755eef05b71014b7adf8f7c4def19fa
parentb6bf58bb1afa4b6c468239087cf14ed7d121d2e3
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

getting latest from dev