From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 14:59:10 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow
X-Git-Tag: 2.140.101^2~19^2~5^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1508713f64e380c5ef0c7a11b94ff2da907eca0e;p=feisty_meow.git

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

1508713f64e380c5ef0c7a11b94ff2da907eca0e