From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 22:31:36 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.92^2^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=fa586d0d421b21b6390d32362c493ddce166fc64;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow into dev
---

fa586d0d421b21b6390d32362c493ddce166fc64