Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts: doomsday/plugins/jdoom/src/d_refresh.c doomsday/plugins/jdoom64/src/d_refresh.c doomsday/plugins/jheretic/src/h_refresh.c doomsday/plugins/jhexen/src/hrefresh.c
Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/deng
Conflicts:
doomsday/plugins/jdoom/src/d_refresh.c
doomsday/plugins/jdoom64/src/d_refresh.c
doomsday/plugins/jheretic/src/h_refresh.c
doomsday/plugins/jhexen/src/hrefresh.c