Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 18:03:50 +0000 (13:03 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 18:03:50 +0000 (13:03 -0500)
commit207037c641fe178d65eeb7de2e8dfce573a24d6d
treebf1d8c24e957089a53da969df2614660d7e7e1b5
parent9a99a7a46834665ebf5cab081fa7fe3cc2a8aa11
parentd47758be987a33eaa8e74547a88dd46b6e8a4979
Merge branch 'master' of feistymeow.org:feisty_meow into dev

pulling in master changes