Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 16 Dec 2017 18:40:20 +0000 (18:40 +0000)
committerChris Koeritz <fred@gruntose.com>
Sat, 16 Dec 2017 18:40:20 +0000 (18:40 +0000)

Trivial merge