Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 01:30:04 +0000 (20:30 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 01:30:04 +0000 (20:30 -0500)
commit27976d67af97d8444167e19cac7252bce992cacd
tree8845354464691a0bb329eb2655858a5236dd5bb4
parenta2f42288898d1dcf7e155ad1649a8b89f6254a4d
parenta82b5c6ac89017b5cc1cbc831ddf92a6c73a28f7
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev