Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Wed, 13 Sep 2017 06:04:47 +0000 (23:04 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Wed, 13 Sep 2017 06:04:47 +0000 (23:04 -0700)
1  2 
tests/check.scm
tests/runtime/test-syncproc.scm

diff --cc tests/check.scm
Simple merge
Simple merge