Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 18 Dec 2017 02:04:56 +0000 (21:04 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 18 Dec 2017 02:04:56 +0000 (21:04 -0500)

Trivial merge