From: Bdale Garbee <bdale@gag.com>
Date: Fri, 25 Nov 2011 03:55:21 +0000 (-0700)
Subject: Merge commit '9c8c5e8c89c11db026c54d46f02c7b63d4e63d0a' into upstream
X-Git-Tag: upstream/1.1.9
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=24660359ee57d0153411c42d25a67ab966483e0a;p=debian%2Fopenrocket

Merge commit '9c8c5e8c89c11db026c54d46f02c7b63d4e63d0a' into upstream

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

24660359ee57d0153411c42d25a67ab966483e0a