Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Wed, 12 Sep 2012 06:26:21 +0000 (00:26 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 12 Sep 2012 06:26:21 +0000 (00:26 -0600)
1  2 
configure.ac

diff --cc configure.ac
Simple merge