Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 19 Nov 2017 01:52:52 +0000 (20:52 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 19 Nov 2017 01:52:52 +0000 (20:52 -0500)

Trivial merge