From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 17:49:35 +0000 (+0000)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow
X-Git-Tag: 2.140.98^2~19^2~5
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=f8835b35c1f242dd4fccbb7c829efb2c8a9a125a;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow

hmmm, merge loop?
---

f8835b35c1f242dd4fccbb7c829efb2c8a9a125a