Merge commit '34e89877342f20fdb8a531ad78dab34cfd2b0843'
authorAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:13:22 +0000 (15:13 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:13:22 +0000 (15:13 +0100)
commitcd36c69619e406082100efb1e62998fc67bbc2a6
treeeef15c546303021d7dad66f8d241383ce1c080b0
parent04f59ec2e7ab73caacbbfa2c5905fe4f240c47c5
parent34e89877342f20fdb8a531ad78dab34cfd2b0843
Merge commit '34e89877342f20fdb8a531ad78dab34cfd2b0843'

Conflicts:
module/Makefile.am
doc/ref/srfi-modules.texi
module/Makefile.am
test-suite/Makefile.am