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
..
2011-09-24 12:05:08 -06:00
2011-09-10 06:55:27 -06:00
2011-09-10 06:55:27 -06:00
2011-09-24 15:21:15 -06:00
2009-07-08 18:59:10 +00:00
2012-05-24 19:25:29 -06:00