Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts: distrib/win32/setup.iss.template doomsday/dep_curl.pri
Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts:
distrib/win32/setup.iss.template
doomsday/dep_curl.pri