Jason Turner 66deef52c8 Merge branch 'master' into 2011-09-09-CxScript
Conflicts:
	include/chaiscript/dispatchkit/bootstrap_stl.hpp
2012-06-01 13:46:58 -06:00
..
2012-05-16 11:54:46 -06:00
2012-05-16 11:55:51 -06:00
2012-05-16 11:55:51 -06:00
2012-05-16 11:55:51 -06:00