Merge branch 'master' of ssh://git.code.sf.net/p/feistymeow/trunk
authorChris Koeritz <fred@gruntose.com>
Tue, 15 May 2018 23:05:01 +0000 (23:05 +0000)
committerChris Koeritz <fred@gruntose.com>
Tue, 15 May 2018 23:05:01 +0000 (23:05 +0000)
argh, merge seems unnecessary.


Trivial merge