Merge branch 'stable-2.0'
authorMark H Weaver <mhw@netris.org>
Tue, 14 Jan 2014 08:18:34 +0000 (03:18 -0500)
committerMark H Weaver <mhw@netris.org>
Tue, 14 Jan 2014 08:18:34 +0000 (03:18 -0500)
commitcb8aaef4d08989aea2b7f088d298f71a03ecc1b2
tree4db2351d09ed63760f55c50ec4cc61a432fb3448
parentb958141cdb081ceb16ca5828abda71f772fe0c57
parent0fc548287e154349f3365976e6a5854736b651ed
Merge branch 'stable-2.0'

Conflicts:
libguile/chars.c
libguile/read.c
test-suite/tests/reader.test
doc/ref/api-data.texi
doc/ref/srfi-modules.texi
libguile/chars.c
libguile/read.c
module/ice-9/boot-9.scm
test-suite/tests/reader.test