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

Trivial merge