Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 13:54:35 +0000 (07:54 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 13:54:35 +0000 (07:54 -0600)

Trivial merge