Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Mon, 11 Dec 2017 17:16:24 +0000 (10:16 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Dec 2017 17:16:24 +0000 (10:16 -0700)

Trivial merge