Merge commit 'cf51f9f07882499867b63d66a06a2dc0174906a0' into upstream upstream/1.1.6
authorBdale Garbee <bdale@gag.com>
Fri, 22 Jul 2011 16:04:26 +0000 (18:04 +0200)
committerBdale Garbee <bdale@gag.com>
Fri, 22 Jul 2011 16:04:26 +0000 (18:04 +0200)
commit5bf5b73c2ec31af0847de4155d5d8bd9a9369b44
tree623a0ad32990d3816f3f502396ab98a0eb0d1d08
parentad323a52db943e95ab29e30f53a2de1a6cf4ba08
parentcf51f9f07882499867b63d66a06a2dc0174906a0
Merge commit 'cf51f9f07882499867b63d66a06a2dc0174906a0' into upstream

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