Jason Turner 13a049cf54 Merge branch 'master' into 2011-09-09-CxScript
Conflicts:
	include/chaiscript/language/chaiscript_engine.hpp
2012-05-24 19:33:48 -06:00
..
chaiscript Merge branch 'master' into 2011-09-09-CxScript 2012-05-24 19:33:48 -06:00