From: Bdale Garbee <bdale@gag.com>
Date: Wed, 6 Oct 2010 21:43:51 +0000 (-0600)
Subject: Merge commit '96d00473b8f48045630714aeffb9ac2e47051292' into upstream
X-Git-Tag: upstream/1.1.3
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=2dd561d42308b1e300f96eed46090a711ee90fcd;p=debian%2Fopenrocket

Merge commit '96d00473b8f48045630714aeffb9ac2e47051292' into upstream

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

2dd561d42308b1e300f96eed46090a711ee90fcd