From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 17:42:32 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~14^2~4
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1f7b5accc03fc8e07f0007c8a5dbf59c5180978d;p=feisty_meow.git

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

1f7b5accc03fc8e07f0007c8a5dbf59c5180978d