Merge remote-tracking branch 'origin/stable-2.0'

author Mark H Weaver <mhw@netris.org>

Fri, 29 Mar 2013 02:24:00 +0000 (22:24 -0400)

committer Mark H Weaver <mhw@netris.org>

Fri, 29 Mar 2013 02:24:00 +0000 (22:24 -0400)
author Mark H Weaver <mhw@netris.org>
Fri, 29 Mar 2013 02:24:00 +0000 (22:24 -0400)
committer Mark H Weaver <mhw@netris.org>
Fri, 29 Mar 2013 02:24:00 +0000 (22:24 -0400)
diff --cc configure.ac
Simple merge
diff --cc doc/ref/srfi-modules.texi
Simple merge
diff --cc libguile/numbers.c
Simple merge
author	Mark H Weaver <mhw@netris.org>
	Fri, 29 Mar 2013 02:24:00 +0000 (22:24 -0400)
committer	Mark H Weaver <mhw@netris.org>
	Fri, 29 Mar 2013 02:24:00 +0000 (22:24 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/ref/srfi-modules.texi	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/numbers.c	patch \|	diff1 \|	diff2 \|	blob \| history