Merge commit 'c39d81a33a94238d026d672f5d96ee9651192bf4' into upstream
authorBdale Garbee <bdale@gag.com>
Sat, 11 Jun 2011 14:30:28 +0000 (08:30 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 11 Jun 2011 14:30:28 +0000 (08:30 -0600)
commit1ada41e22fb7ea1601c9ff86b9e86bf41842a065
tree30a48e7bfc884fe19a9091f2f22d3c01a867e91d
parentbef0a48f602a439d5889e758d9db59e4ca97eadc
parentc39d81a33a94238d026d672f5d96ee9651192bf4
Merge commit 'c39d81a33a94238d026d672f5d96ee9651192bf4' into upstream

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