Jason Turner 47ab27fd11 Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
	include/chaiscript/dispatchkit/proxy_functions.hpp
	releasenotes.txt
2012-11-27 21:42:21 -07:00
..
chaiscript Merge branch 'master' into ChaiScript_5_0_CPP_11 2012-11-27 21:42:21 -07:00