Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts: doomsday/plugins/jheretic/src/p_mobj.c
Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts:
doomsday/plugins/jheretic/src/p_mobj.c