Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Sun, 14 Apr 2013 06:48:33 +0000 (02:48 -0400)
committerMark H Weaver <mhw@netris.org>
Sun, 14 Apr 2013 06:48:33 +0000 (02:48 -0400)
commitf6f4feb0a2222efcb297e634603621126542e63f
tree0b590c025f688ab625827c4f692fa7783716b558
parent1e051065628a7f1bd4398fcc11cd181f86084629
parentf5b2eea6a39507ecf6a8ecc62cc1c796c45c2d1d
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
GUILE-VERSION
libguile/array-map.c
libguile/fports.h
libguile/gc.h
libguile/inline.h
libguile/ports.c
libguile/ports.h
libguile/print.c
libguile/r6rs-ports.c
libguile/read.c
test-suite/tests/00-socket.test
33 files changed:
configure.ac
doc/ref/api-control.texi
doc/ref/api-data.texi
doc/ref/guile-invoke.texi
doc/ref/posix.texi
libguile/Makefile.am
libguile/array-map.c
libguile/filesys.c
libguile/fports.c
libguile/fports.h
libguile/gc.h
libguile/gen-scmconfig.c
libguile/init.c
libguile/keywords.c
libguile/ports-internal.h
libguile/ports.c
libguile/ports.h
libguile/print.c
libguile/r6rs-ports.c
libguile/read.c
libguile/strings.c
libguile/vports.c
m4/gnulib-cache.m4
meta/Makefile.am
module/ice-9/boot-9.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
module/language/tree-il/peval.scm
test-suite/standalone/Makefile.am
test-suite/tests/00-socket.test
test-suite/tests/foreign.test
test-suite/tests/ports.test
test-suite/tests/r6rs-ports.test