From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 19 Dec 2017 19:01:40 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.107^2~2^2~15
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=c606fc65e841709bd6e8c7a6e038a1b37f42c1d0;p=feisty_meow.git

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

c606fc65e841709bd6e8c7a6e038a1b37f42c1d0