Merge commit '34e89877342f20fdb8a531ad78dab34cfd2b0843'

author Andy Wingo <wingo@pobox.com>

Fri, 7 Feb 2014 14:13:22 +0000 (15:13 +0100)

committer Andy Wingo <wingo@pobox.com>

Fri, 7 Feb 2014 14:13:22 +0000 (15:13 +0100)
author Andy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:13:22 +0000 (15:13 +0100)
committer Andy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:13:22 +0000 (15:13 +0100)
diff --cc doc/ref/srfi-modules.texi
Simple merge
diff --cc module/Makefile.am
Simple merge
diff --cc test-suite/Makefile.am
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Fri, 7 Feb 2014 14:13:22 +0000 (15:13 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Fri, 7 Feb 2014 14:13:22 +0000 (15:13 +0100)
		1	2
doc/ref/srfi-modules.texi	patch \|	diff1 \|	diff2 \|	blob \| history
module/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
test-suite/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history