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
..
2012-11-07 14:13:08 -07:00
2012-11-07 14:13:08 -07:00
2012-07-13 12:25:50 -06:00
2012-05-16 11:55:51 -06:00