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

Merge branch 'upstream' into debian
---

4aedb993587b1d9b21e3c8c2fa8e1d921c11230b