Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts: distrib/build_version.py distrib/debian/rules doomsday/versions.pri
Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts:
distrib/build_version.py
distrib/debian/rules
doomsday/versions.pri