Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3

SRB2.cbp

src/CMakeLists.txt

src/blua/Makefile.cfg

src/dehacked.c

src/lua_baselib.c

src/lua_blockmaplib.c

src/lua_hudlib.c

src/lua_libs.h

src/lua_maplib.c

src/lua_script.c

src/lua_script.h

src/p_spec.c

src/p_spec.h

src/sdl/Srb2SDL-vc10.vcxproj

src/sdl/Srb2SDL-vc10.vcxproj.filters

src/win32/Srb2win-vc10.vcxproj

src/win32/Srb2win-vc10.vcxproj.filters