Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:16:23 +0000 (22:16 +0000)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:16:23 +0000 (22:16 +0000)
commit130a17120755eef05b71014b7adf8f7c4def19fa
tree3107ed73b8a32d8d9e3eb4516dd618e922bf7466
parentbea706608dd5b45782f21ab8642f48e4b7be28b1
parent54b61896e2d220b282a3ad77148aec5cd9484fcb
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

fluffing issues