Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.91 release-2.140.91
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 19:29:08 +0000 (14:29 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 19:29:08 +0000 (14:29 -0500)
commite4da0f3a984df2f3145e3f59ef78caece7f19d91
treed83c3ebb0114145f2308aed2e26a4a588b3cc6c3
parentdd74823e9ff7b8b8cdfb709211f06d3e95bcdc83
parent3f11b26ebf3d7bf9fb4fb00813034eda0076f8c0
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.91

getting things snacky