Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 3 Feb 2018 01:18:04 +0000 (20:18 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 3 Feb 2018 01:18:04 +0000 (20:18 -0500)

Trivial merge