Merge pull request #776 from jviereck/jpegimage_cleanup

author notmasteryet <async.processingjs@yahoo.com>

Wed, 7 Dec 2011 19:11:11 +0000 (11:11 -0800)

committer notmasteryet <async.processingjs@yahoo.com>

Wed, 7 Dec 2011 19:11:11 +0000 (11:11 -0800)
author notmasteryet <async.processingjs@yahoo.com>
Wed, 7 Dec 2011 19:11:11 +0000 (11:11 -0800)
committer notmasteryet <async.processingjs@yahoo.com>
Wed, 7 Dec 2011 19:11:11 +0000 (11:11 -0800)
diff --cc src/canvas.js
Simple merge
diff --cc src/core.js
Simple merge
diff --cc src/obj.js
Simple merge
author	notmasteryet <async.processingjs@yahoo.com>
	Wed, 7 Dec 2011 19:11:11 +0000 (11:11 -0800)
committer	notmasteryet <async.processingjs@yahoo.com>
	Wed, 7 Dec 2011 19:11:11 +0000 (11:11 -0800)
		1	2
src/canvas.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/obj.js	patch \|	diff1 \|	diff2 \|	blob \| history