Merge commit 'ed72201a795ac1c8d6c0288b6bb710f2bd0ebd9c'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:53:06 +0000 (14:53 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:53:06 +0000 (14:53 +0100)
commit0a5b437ef9063df2a3728338a7cd6b86c4c2e275
treeb06a513c6dd1fef8644e8a2d6813bd2ca4252c17
parente19235e21bad6fdf8c8152dc5b460685b551f330
parented72201a795ac1c8d6c0288b6bb710f2bd0ebd9c
Merge commit 'ed72201a795ac1c8d6c0288b6bb710f2bd0ebd9c'

Conflicts:
test-suite/tests/r6rs-ports.test
libguile/r6rs-ports.c
module/ice-9/command-line.scm
test-suite/tests/r6rs-ports.test