Jason Turner 6bb90f9d6d Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
	include/chaiscript/language/chaiscript_eval.hpp
2012-11-10 16:59:32 -07:00
..
chaiscript Merge branch 'master' into ChaiScript_5_0_CPP_11 2012-11-10 16:59:32 -07:00