Merge commit 'dc65b88d839c326889618112c4870ad3a64e9446'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:56:16 +0000 (14:56 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:56:16 +0000 (14:56 +0100)
commit54f17b7b597a3695a25babac92255ed52fbeec4a
tree86b06db635fbbabfd00dccfbb7efd10829b94369
parentc8b7b0dad33d6221682c5f49b7635d8de7e15bab
parentdc65b88d839c326889618112c4870ad3a64e9446
Merge commit 'dc65b88d839c326889618112c4870ad3a64e9446'

Conflicts:
libguile/srfi-4.c
libguile/srfi-4.c