Merge commit 'ee3d5d64b8f5f091433b62383f349ac95647dd3a' into upstream upstream/1.1.8
authorBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2011 21:16:09 +0000 (15:16 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2011 21:16:09 +0000 (15:16 -0600)
commit6a075c48f1d708131bba9ef14a2944130cca51c4
tree58bc6f0fc547e5794332cc7164d6c918d1e0d7ae
parent7c87ba0bc6b77fb94c1af63099294fd6ee98c371
parentee3d5d64b8f5f091433b62383f349ac95647dd3a
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