Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 18:34:44 +0000 (18:34 +0000)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 18:34:44 +0000 (18:34 +0000)

Trivial merge