Merge commit '1fb64b161835358b8e64a56622c6225d3285f7f7' into upstream upstream/1.1.2
authorBdale Garbee <bdale@gag.com>
Wed, 8 Sep 2010 03:02:25 +0000 (21:02 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 8 Sep 2010 03:02:25 +0000 (21:02 -0600)
commitff53e7c703a7adfaecef73554effc7518a33f3d9
treec7907cfc679bf5a83d8d62652ea94636618ca1d5
parent4ce144011e6d290e47db1d3e5574c3f0b3d8a83c
parent1fb64b161835358b8e64a56622c6225d3285f7f7
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