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)
commit717d18a858cb01b944ae470a6af31a86b038b5a5
tree48e0c060c479afab7b5ab90e96ce1fbca88c389c
parent491bfd133c33e140bfb93ac47656bf429af42e2e
parent0ba4e1bd22131a5ef6a254fa209b3c6dd1d33eb9
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

pulling fix for version control generated list file