From: Bdale Garbee <bdale@gag.com>
Date: Sat, 13 Aug 2011 18:30:46 +0000 (-0600)
Subject: Merge branch 'upstream' into debian
X-Git-Tag: debian/1.1.7-1~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=29ef6fa1db69c24e26938a7819d333ca012f5a3f;p=debian%2Fopenrocket

Merge branch 'upstream' into debian
---

29ef6fa1db69c24e26938a7819d333ca012f5a3f