From: Bdale Garbee <bdale@gag.com>
Date: Thu, 25 Aug 2011 21:19:46 +0000 (-0600)
Subject: Merge branch 'upstream' into debian
X-Git-Tag: debian/1.1.8-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b1c573776a50dbf618f27898cdad90cafe9addc2;p=debian%2Fopenrocket

Merge branch 'upstream' into debian
---

b1c573776a50dbf618f27898cdad90cafe9addc2