Merge branch 'stable-2.0'
authorMark H Weaver <mhw@netris.org>
Tue, 14 Jan 2014 06:16:42 +0000 (01:16 -0500)
committerMark H Weaver <mhw@netris.org>
Tue, 14 Jan 2014 06:30:56 +0000 (01:30 -0500)
commitb958141cdb081ceb16ca5828abda71f772fe0c57
treec65209e78eb9c3f00fc88ad4e11423c13dd8ddc8
parentbdad13401611db73c57dcf8a1285b37e9b2ea31e
parentc9d55a7e4ec079a735af40df6e652db5585e6826
Merge branch 'stable-2.0'

Conflicts:
libguile/hash.c
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
test-suite/tests/r6rs-ports.test
doc/ref/api-macros.texi
doc/ref/guile.texi
libguile/hash.c
libguile/r6rs-ports.c
module/ice-9/command-line.scm
module/ice-9/local-eval.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
module/system/repl/common.scm
test-suite/tests/r6rs-ports.test
test-suite/tests/syntax.test