Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 03:56:30 +0000 (22:56 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 03:56:30 +0000 (22:56 -0500)
pulling fix for version control generated list file


Trivial merge