Jason Turner 2969f61fe4 Merge branch 'master' into 2011-09-09-CxScript
Conflicts:
	include/chaiscript/dispatchkit/boxed_number.hpp
	include/chaiscript/dispatchkit/dispatchkit.hpp
2012-05-28 11:42:55 -06:00
..
chaiscript Merge branch 'master' into 2011-09-09-CxScript 2012-05-28 11:42:55 -06:00