From: Bdale Garbee <bdale@gag.com>
Date: Sat, 11 Jun 2011 14:30:28 +0000 (-0600)
Subject: Merge commit 'c39d81a33a94238d026d672f5d96ee9651192bf4' into upstream
X-Git-Tag: upstream/1.1.5~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=1ada41e22fb7ea1601c9ff86b9e86bf41842a065;p=debian%2Fopenrocket

Merge commit 'c39d81a33a94238d026d672f5d96ee9651192bf4' into upstream

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

1ada41e22fb7ea1601c9ff86b9e86bf41842a065