Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Mon, 12 Feb 2018 23:38:57 +0000 (16:38 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 12 Feb 2018 23:38:57 +0000 (16:38 -0700)

Trivial merge