Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts: doomsday/engine/api/doomsday.def
Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts:
doomsday/engine/api/doomsday.def