Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Thu, 14 Aug 2014 23:08:36 +0000 (17:08 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 14 Aug 2014 23:08:36 +0000 (17:08 -0600)

Trivial merge