From: Bdale Garbee <bdale@gag.com>
Date: Thu, 13 Sep 2012 02:01:22 +0000 (-0600)
Subject: Merge branch 'new-debian' into debian
X-Git-Tag: debian/1.1-1~5
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=3b612efcd1dddc6a3d59012f7ed57754b1f798c2

Merge branch 'new-debian' into debian

Conflicts:
	ChangeLog
	debian/altos.install
	debian/changelog
	debian/control
	debian/copyright
	debian/dirs
	debian/docs
	debian/menu
	debian/rules
	src/Makefile
---

3b612efcd1dddc6a3d59012f7ed57754b1f798c2