Merge branch 'remove-sdlnet' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into remove-sdlnet
Conflicts: doomsday/config.pri
Merge branch 'remove-sdlnet' of ssh://deng.git.sourceforge.net/gitroot/deng/deng into remove-sdlnet
Conflicts:
doomsday/config.pri