Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into touching_fixes

debian/docs

src/Makefile

src/d_netcmd.c

src/lua_hook.h

src/lua_hooklib.c

src/p_saveg.c

src/p_user.c

src/sdl/i_video.c

src/win32/Makefile.cfg