Merge branch 'master' of git://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 17:26:01 +0000 (12:26 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 17:26:01 +0000 (12:26 -0500)
commit48eec5d644912678bee5bca536e37ecf63249faf
treea686c1b7d09baf7454af64d7709c0d020bf48255
parenta2700418b257637f62c453c8b0d8117f70ed779f
parent7c691be10be57164d5338635245572801c8068b3
Merge branch 'master' of git://feistymeow.org/feisty_meow

getting to local master