Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Mon, 1 Apr 2013 09:42:31 +0000 (05:42 -0400)
committerMark H Weaver <mhw@netris.org>
Mon, 1 Apr 2013 09:42:31 +0000 (05:42 -0400)
commit1e051065628a7f1bd4398fcc11cd181f86084629
treeed3b51a07d5c4625ff1eb771eeb1a5e5279900d6
parent86cf4773ff94a128247d484e6d69786869f41ebc
parentde2bc673bba931a70e3b96336cab6512a47541fe
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/r6rs-ports.c
doc/ref/api-data.texi
libguile/r6rs-ports.c
libguile/strings.c