Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Fri, 21 Jul 2017 23:44:03 +0000 (17:44 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 21 Jul 2017 23:44:03 +0000 (17:44 -0600)

Trivial merge