From: Bdale Garbee <bdale@gag.com>
Date: Tue, 23 Mar 2010 02:58:53 +0000 (-0600)
Subject: Merge branch 'upstream' into debian
X-Git-Tag: debian/1.1.0-1^2~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2Fv1.1.0;p=debian%2Fopenrocket

Merge branch 'upstream' into debian

Conflicts:
	cleanup-script.sh
---

d2486dbf0f536423f63334f5c27218de17585e39