From: Bdale Garbee <bdale@gag.com>
Date: Sat, 11 Jun 2011 14:31:37 +0000 (-0600)
Subject: Merge branch 'upstream' into debian
X-Git-Tag: debian/1.1.5-1~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d0db5165229468a69e54857f672df5aa7cfd5a00;p=debian%2Fopenrocket

Merge branch 'upstream' into debian
---

d0db5165229468a69e54857f672df5aa7cfd5a00