From: Bdale Garbee <bdale@gag.com>
Date: Wed, 29 Aug 2012 05:39:53 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.1~67
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5ed88fb72c3e3ecf3333c700d838667db71cfbdc;hp=-c

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	debian/control
---

5ed88fb72c3e3ecf3333c700d838667db71cfbdc