Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Tue, 23 Oct 2012 15:38:36 +0000 (09:38 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 23 Oct 2012 15:38:36 +0000 (09:38 -0600)
1  2 
altosui/Makefile.am

Simple merge