Merge branch 'master' of http://github.com/mthom/rusty-wam into develop

author Mark Thom <[email protected]>

Thu, 26 Apr 2018 00:59:59 +0000 (18:59 -0600)

committer Mark Thom <[email protected]>

Thu, 26 Apr 2018 00:59:59 +0000 (18:59 -0600)
author Mark Thom <[email protected]>
Thu, 26 Apr 2018 00:59:59 +0000 (18:59 -0600)
committer Mark Thom <[email protected]>
Thu, 26 Apr 2018 00:59:59 +0000 (18:59 -0600)
diff --cc src/prolog/ast.rs
Simple merge
diff --cc src/prolog/io.rs
Simple merge
author	Mark Thom <[email protected]>
	Thu, 26 Apr 2018 00:59:59 +0000 (18:59 -0600)
committer	Mark Thom <[email protected]>
	Thu, 26 Apr 2018 00:59:59 +0000 (18:59 -0600)
		1	2
src/prolog/ast.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/prolog/io.rs	patch \|	diff1 \|	diff2 \|	blob \| history