Merge branch 'branch-1.2' of ssh://git.gag.com/scm/git/fw/altos into branch-1.2
authorBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:31:48 +0000 (09:31 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:31:48 +0000 (09:31 -0600)
commit5a329c7f588334df7443b47c8f478ebadf312f62
treef273c05c7659af0f8c5b7235789958583230d06e
parent9b138221283f0b8e8df5a799f75d73fd456028a0
parent03fe10efd307da10e35c5f6a46f0c8b1a3888c57
Merge branch 'branch-1.2' of ssh://git.gag.com/scm/git/fw/altos into branch-1.2