Merge commit 'afc42f9336add2d5bc7d8c6504eac6e9ab362b02' into upstream upstream/1.1.4
authorBdale Garbee <bdale@gag.com>
Wed, 9 Mar 2011 04:40:43 +0000 (21:40 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 9 Mar 2011 04:40:43 +0000 (21:40 -0700)
commitbef0a48f602a439d5889e758d9db59e4ca97eadc
tree16c99d642bb8b41a5725383a26774ff0dca95c35
parent2dd561d42308b1e300f96eed46090a711ee90fcd
parentafc42f9336add2d5bc7d8c6504eac6e9ab362b02
Merge commit 'afc42f9336add2d5bc7d8c6504eac6e9ab362b02' into upstream

Conflicts:
lib-test/junit-dep-4.8.2.jar
web/html/actions/updates.php
web/html/download.html
web/html/index.html
web/htp/htp.def
web/htp/news.htp