From: Bdale Garbee <bdale@gag.com>
Date: Fri, 22 Jul 2011 16:04:49 +0000 (+0200)
Subject: Merge branch 'upstream' into debian
X-Git-Tag: debian/1.1.6-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=7815bbe17b4321996f86708948d30466a81d31d0;p=debian%2Fopenrocket

Merge branch 'upstream' into debian
---

7815bbe17b4321996f86708948d30466a81d31d0