Merge commit '96d00473b8f48045630714aeffb9ac2e47051292' into upstream upstream/1.1.3
authorBdale Garbee <bdale@gag.com>
Wed, 6 Oct 2010 21:43:51 +0000 (15:43 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 6 Oct 2010 21:43:51 +0000 (15:43 -0600)
commit2dd561d42308b1e300f96eed46090a711ee90fcd
treec9cb4f61e01425425002c17048144f63353e5993
parentff53e7c703a7adfaecef73554effc7518a33f3d9
parent96d00473b8f48045630714aeffb9ac2e47051292
Merge commit '96d00473b8f48045630714aeffb9ac2e47051292' into upstream

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