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)
commit2072733f108c8b605b24a01baa43759403b00f49
treef8a21793f39ae531935f036405d34cb06639d8b5
parentcef25cce53ea01e316370c7983044e858ed9bcb7
parent130a17120755eef05b71014b7adf8f7c4def19fa
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92

remerge