Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Sat, 6 Dec 2014 22:39:53 +0000 (15:39 -0700)
committerBdale Garbee <bdale@gag.com>
Sat, 6 Dec 2014 22:39:53 +0000 (15:39 -0700)

Trivial merge