Merge commit 'ca5e0414e96886177d883a249edd957d2331db65'
authorAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:05:55 +0000 (15:05 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:05:55 +0000 (15:05 +0100)
commitae7f13be4bda70a6bc4a8478ce043df1a752ee6e
tree4d68cbc18989374bdbf33b8d46fa56b6f8164998
parentdc7a33fa871c42d0474602f3560d3ce350e1f1c3
parentca5e0414e96886177d883a249edd957d2331db65
Merge commit 'ca5e0414e96886177d883a249edd957d2331db65'

Conflicts:
module/language/tree-il/primitives.scm
doc/ref/srfi-modules.texi
module/Makefile.am
module/language/tree-il/primitives.scm
test-suite/Makefile.am