Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Mon, 9 May 2016 21:52:38 +0000 (15:52 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 9 May 2016 21:52:38 +0000 (15:52 -0600)

Trivial merge