Jason Turner 1a48dd9480 Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
	include/chaiscript/dispatchkit/dynamic_object.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
2013-04-25 12:42:00 -06:00
..
chaiscript Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 12:42:00 -06:00