Merge commit 'a38024baaa32d1a6d91fdc81388c88bbb926c3ae'
authorAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 15:15:38 +0000 (16:15 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 15:15:38 +0000 (16:15 +0100)
commit9b95f3ced4f4cc4c7d0ffa59c530a2e1a17a19fc
tree93c10f0a6fa6c224df9e76df63d32cc3ac2d65ca
parent6683f204ba95321f2cf904d0508117b027f2f2fc
parenta38024baaa32d1a6d91fdc81388c88bbb926c3ae
Merge commit 'a38024baaa32d1a6d91fdc81388c88bbb926c3ae'

Conflicts:
libguile/ports.h
libguile/ports.c
libguile/ports.h
libguile/read.c