Merge branch 'master' into ffi

author David Vázquez <davazp@gmail.com>

Fri, 7 Jun 2013 15:00:05 +0000 (16:00 +0100)

committer David Vázquez <davazp@gmail.com>

Fri, 7 Jun 2013 15:00:05 +0000 (16:00 +0100)
author David Vázquez <davazp@gmail.com>
Fri, 7 Jun 2013 15:00:05 +0000 (16:00 +0100)
committer David Vázquez <davazp@gmail.com>
Fri, 7 Jun 2013 15:00:05 +0000 (16:00 +0100)
diff --cc src/boot.lisp
Simple merge
diff --cc src/compiler.lisp
Simple merge
diff --cc src/package.lisp
Simple merge
diff --cc src/print.lisp
Simple merge
author	David Vázquez <davazp@gmail.com>
	Fri, 7 Jun 2013 15:00:05 +0000 (16:00 +0100)
committer	David Vázquez <davazp@gmail.com>
	Fri, 7 Jun 2013 15:00:05 +0000 (16:00 +0100)
		1	2
src/boot.lisp	patch \|	diff1 \|	diff2 \|	blob \| history
src/compiler.lisp	patch \|	diff1 \|	diff2 \|	blob \| history
src/package.lisp	patch \|	diff1 \|	diff2 \|	blob \| history
src/print.lisp	patch \|	diff1 \|	diff2 \|	blob \| history