Jason Turner 6e71409a52 Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
2013-04-25 16:17:51 -06:00
..
chaiscript Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 16:17:51 -06:00