From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 13:22:55 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~10
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=0c81d9803f80486e0c95669acbdf871c0c2e64e2;p=feisty_meow.git

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

0c81d9803f80486e0c95669acbdf871c0c2e64e2