Merge branch 'master' of ssh://codewiz.org/~/public_git/mandelwow
authorBernie Innocenti <bernie@codewiz.org>
Sat, 8 Apr 2017 13:47:58 +0000 (09:47 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Sat, 8 Apr 2017 13:47:58 +0000 (09:47 -0400)

Trivial merge