From: Bdale Garbee <bdale@gag.com>
Date: Wed, 8 Sep 2010 03:02:25 +0000 (-0600)
Subject: Merge commit '1fb64b161835358b8e64a56622c6225d3285f7f7' into upstream
X-Git-Tag: upstream/1.1.2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=ff53e7c703a7adfaecef73554effc7518a33f3d9;p=debian%2Fopenrocket

Merge commit '1fb64b161835358b8e64a56622c6225d3285f7f7' into upstream

Conflicts:
	web/html/actions/updates.php
	web/html/alternative.css
	web/html/contact.html
	web/html/documentation.html
	web/html/download.html
	web/html/features.html
	web/html/getinvolved.html
	web/html/index.html
	web/html/layout.css
	web/html/license.html
	web/html/report.html
	web/htp/body.htt
	web/htp/contact.htp
	web/htp/documentation.htp
	web/htp/download.htp
	web/htp/htp.def
	web/htp/index.htp
	web/htp/news.htp
---

ff53e7c703a7adfaecef73554effc7518a33f3d9