Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 30 Dec 2017 20:31:25 +0000 (15:31 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 30 Dec 2017 20:31:25 +0000 (15:31 -0500)

Trivial merge