From: Bdale Garbee <bdale@gag.com>
Date: Sat, 13 Aug 2011 18:30:21 +0000 (-0600)
Subject: Merge commit '370593c3bd81b3bb9e8c29ae7f6e351b7a7e0263' into upstream
X-Git-Tag: upstream/1.1.7
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=7c87ba0bc6b77fb94c1af63099294fd6ee98c371;p=debian%2Fopenrocket

Merge commit '370593c3bd81b3bb9e8c29ae7f6e351b7a7e0263' into upstream

Conflicts:
	web/html/actions/updates.php
	web/html/download.html
	web/html/features.html
	web/html/index.html
	web/html/techdoc.pdf
	web/htp/features.htp
	web/htp/htp.def
	web/htp/index.htp
	web/htp/news.htp
---

7c87ba0bc6b77fb94c1af63099294fd6ee98c371