Jason Turner 52bb08f4d5 Merge branch 'master' into ChaiScript_5_0_CPP_11 ...

Conflicts:
	include/chaiscript/dispatchkit/bootstrap_stl.hpp
	include/chaiscript/language/chaiscript_engine.hpp
	include/chaiscript/language/chaiscript_prelude.hpp

2014-02-17 16:31:16 -07:00

..

utility.hpp

Merge branch 'master' into ChaiScript_5_0_CPP_11

2014-02-17 16:31:16 -07:00