Merge pull request #115 from orodley/smarter-escape-string

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

Thu, 6 Jun 2013 21:40:36 +0000 (14:40 -0700)

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

Thu, 6 Jun 2013 21:40:36 +0000 (14:40 -0700)
author David Vázquez <davazp@gmail.com>
Thu, 6 Jun 2013 21:40:36 +0000 (14:40 -0700)
committer David Vázquez <davazp@gmail.com>
Thu, 6 Jun 2013 21:40:36 +0000 (14:40 -0700)
diff --cc src/compiler.lisp
Simple merge
diff --cc src/print.lisp
Simple merge
author	David Vázquez <davazp@gmail.com>
	Thu, 6 Jun 2013 21:40:36 +0000 (14:40 -0700)
committer	David Vázquez <davazp@gmail.com>
	Thu, 6 Jun 2013 21:40:36 +0000 (14:40 -0700)
		1	2
src/compiler.lisp	patch \|	diff1 \|	diff2 \|	blob \| history
src/print.lisp	patch \|	diff1 \|	diff2 \|	blob \| history