From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 19:57:53 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~3^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=8b8777a1a68a1bb2e848a1eed1a7084f5867dc04;p=feisty_meow.git

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

8b8777a1a68a1bb2e848a1eed1a7084f5867dc04