From: Bdale Garbee <bdale@gag.com>
Date: Tue, 23 Mar 2010 01:44:39 +0000 (-0600)
Subject: Merge branch 'upstream' into debian
X-Git-Tag: debian/1.1.0-1^2~8
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=71094d0613a949a37b192150562ac9fce91386d7;p=debian%2Fopenrocket

Merge branch 'upstream' into debian
---

71094d0613a949a37b192150562ac9fce91386d7