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

Trivial merge