From: Bdale Garbee Date: Thu, 25 Aug 2011 21:16:09 +0000 (-0600) Subject: Merge commit 'ee3d5d64b8f5f091433b62383f349ac95647dd3a' into upstream X-Git-Tag: upstream/1.1.8 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=6a075c48f1d708131bba9ef14a2944130cca51c4;p=debian%2Fopenrocket Merge commit 'ee3d5d64b8f5f091433b62383f349ac95647dd3a' into upstream Conflicts: web/html/actions/updates.php 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/getinvolved.htp web/htp/htp.def web/htp/index.htp web/htp/license.htp web/htp/news.htp --- 6a075c48f1d708131bba9ef14a2944130cca51c4