Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Sun, 22 Feb 2015 21:55:40 +0000 (14:55 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 22 Feb 2015 21:55:40 +0000 (14:55 -0700)

Trivial merge