Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 18 Nov 2017 02:40:45 +0000 (21:40 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 18 Nov 2017 02:40:45 +0000 (21:40 -0500)

Trivial merge