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

Merge commit 'cf51f9f07882499867b63d66a06a2dc0174906a0' into upstream

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

5bf5b73c2ec31af0847de4155d5d8bd9a9369b44