Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 29 Dec 2017 16:27:25 +0000 (11:27 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 29 Dec 2017 16:27:25 +0000 (11:27 -0500)

Trivial merge