Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 01:29:07 +0000 (18:29 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 01:29:07 +0000 (18:29 -0700)

Trivial merge