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

Trivial merge