Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 01:25:35 +0000 (18:25 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 01:25:35 +0000 (18:25 -0700)

Trivial merge