Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 20:57:35 +0000 (15:57 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 20:57:35 +0000 (15:57 -0500)
merge


Trivial merge