Merge branch 'new-debian' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 02:01:22 +0000 (20:01 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 02:01:22 +0000 (20:01 -0600)
Conflicts:
ChangeLog
debian/altos.install
debian/changelog
debian/control
debian/copyright
debian/dirs
debian/docs
debian/menu
debian/rules
src/Makefile


Trivial merge