From: Bdale Garbee <bdale@gag.com>
Date: Fri, 25 Nov 2011 03:56:15 +0000 (-0700)
Subject: Merge branch 'upstream' into debian
X-Git-Tag: debian/1.1.9-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=db637de8259ac355b49f8ef14033daa46d113475;p=debian%2Fopenrocket

Merge branch 'upstream' into debian
---

db637de8259ac355b49f8ef14033daa46d113475