From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 15 May 2018 23:05:01 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.code.sf.net/p/feistymeow/trunk
X-Git-Tag: 2.140.116~1^2~5
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1f8e3880a0827865a0a81d7e63aa5eaa4b4d1441;p=feisty_meow.git

Merge branch 'master' of ssh://git.code.sf.net/p/feistymeow/trunk

argh, merge seems unnecessary.
---

1f8e3880a0827865a0a81d7e63aa5eaa4b4d1441