Merge commit '370593c3bd81b3bb9e8c29ae7f6e351b7a7e0263' into upstream upstream/1.1.7
authorBdale Garbee <bdale@gag.com>
Sat, 13 Aug 2011 18:30:21 +0000 (12:30 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 13 Aug 2011 18:30:21 +0000 (12:30 -0600)
commit7c87ba0bc6b77fb94c1af63099294fd6ee98c371
treee586056b2a0d437f12909b1fcace703dd8a2f655
parent5bf5b73c2ec31af0847de4155d5d8bd9a9369b44
parent370593c3bd81b3bb9e8c29ae7f6e351b7a7e0263
Merge commit '370593c3bd81b3bb9e8c29ae7f6e351b7a7e0263' into upstream

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