Merge branch 'stable-2.0'
authorMark H Weaver <mhw@netris.org>
Tue, 21 Jan 2014 08:57:04 +0000 (03:57 -0500)
committerMark H Weaver <mhw@netris.org>
Tue, 21 Jan 2014 08:57:04 +0000 (03:57 -0500)
commitba578eb04460833c5acb1d8f4c08d2facde15e80
tree9fcecf28c314eb14b35efb2c3c18e47bc0dea859
parenta9eca8f5d1bb2a3aabb80b59c54fc355a00a0382
parent611563fb05c18ca52f780746e9963ca9735e9bac
Merge branch 'stable-2.0'

Conflicts:
libguile/read.c
test-suite/tests/web-response.test
doc/ref/api-macros.texi
doc/ref/srfi-modules.texi
libguile/r6rs-ports.c
libguile/read.c
module/ice-9/boot-9.scm
test-suite/tests/r6rs-ports.test
test-suite/tests/syntax.test
test-suite/tests/web-response.test