Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Sun, 7 Sep 2014 05:42:47 +0000 (23:42 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 7 Sep 2014 05:42:47 +0000 (23:42 -0600)

Trivial merge