Jason Turner 90125d0f9a Merge branch 'master' into 2011-09-09-CxScript ...

Conflicts:
	contrib/geshi/chaiscript.php
	include/chaiscript/language/chaiscript_common.hpp
	include/chaiscript/language/chaiscript_eval.hpp
	include/chaiscript/language/chaiscript_parser.hpp

2012-05-18 09:05:46 -06:00

..

chaiscript.php

Merge branch 'master' into 2011-09-09-CxScript

2012-05-18 09:05:46 -06:00