Merge branch 'master' of localhost:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Fri, 9 Jun 2017 18:05:11 +0000 (18:05 +0000)
committerChris Koeritz <fred@gruntose.com>
Fri, 9 Jun 2017 18:05:11 +0000 (18:05 +0000)

Trivial merge