Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Tue, 29 Sep 2015 06:46:42 +0000 (00:46 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 29 Sep 2015 06:46:42 +0000 (00:46 -0600)

Trivial merge