From: Bdale Garbee <bdale@gag.com>
Date: Wed, 9 Mar 2011 04:40:43 +0000 (-0700)
Subject: Merge commit 'afc42f9336add2d5bc7d8c6504eac6e9ab362b02' into upstream
X-Git-Tag: upstream/1.1.4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=bef0a48f602a439d5889e758d9db59e4ca97eadc;p=debian%2Fopenrocket

Merge commit 'afc42f9336add2d5bc7d8c6504eac6e9ab362b02' into upstream

Conflicts:
	lib-test/junit-dep-4.8.2.jar
	web/html/actions/updates.php
	web/html/download.html
	web/html/index.html
	web/htp/htp.def
	web/htp/news.htp
---

bef0a48f602a439d5889e758d9db59e4ca97eadc