Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:19:15 +0000 (17:19 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:19:15 +0000 (17:19 -0500)
remerge


Trivial merge