Merge commit '9c8c5e8c89c11db026c54d46f02c7b63d4e63d0a' into upstream upstream/1.1.9
authorBdale Garbee <bdale@gag.com>
Fri, 25 Nov 2011 03:55:21 +0000 (20:55 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 25 Nov 2011 03:55:21 +0000 (20:55 -0700)
commit24660359ee57d0153411c42d25a67ab966483e0a
tree343eaf869f11bde0003968ce95c5a1676e9a912a
parent6a075c48f1d708131bba9ef14a2944130cca51c4
parent9c8c5e8c89c11db026c54d46f02c7b63d4e63d0a
Merge commit '9c8c5e8c89c11db026c54d46f02c7b63d4e63d0a' into upstream

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