Merge commit '5af307de43e4b65eec7f235b48a8908f2a00f134'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 11:50:18 +0000 (12:50 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 11:50:18 +0000 (12:50 +0100)
commit678995ff79be5c705c752ed2687c616c06da3a40
treec3143db2a29f3a9f6c1d6cfcc5ac6ea4eb9e2666
parent24d4f029bfdfe547c2a4598163c5c753d8796cfb
parent5af307de43e4b65eec7f235b48a8908f2a00f134
Merge commit '5af307de43e4b65eec7f235b48a8908f2a00f134'

Conflicts:
test-suite/tests/reader.test
doc/ref/api-data.texi
libguile/read.c
test-suite/tests/reader.test