Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 03:42:41 +0000 (22:42 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 03:42:41 +0000 (22:42 -0500)

Trivial merge