Merge branch 'refs/heads/master' into text-select

author Artur Adib <arturadib@gmail.com>

Mon, 14 Nov 2011 20:21:18 +0000 (15:21 -0500)

committer Artur Adib <arturadib@gmail.com>

Mon, 14 Nov 2011 20:21:18 +0000 (15:21 -0500)
author Artur Adib <arturadib@gmail.com>
Mon, 14 Nov 2011 20:21:18 +0000 (15:21 -0500)
committer Artur Adib <arturadib@gmail.com>
Mon, 14 Nov 2011 20:21:18 +0000 (15:21 -0500)
diff --cc src/canvas.js
Simple merge
diff --cc src/core.js
Simple merge
diff --cc web/viewer.js
Simple merge
author	Artur Adib <arturadib@gmail.com>
	Mon, 14 Nov 2011 20:21:18 +0000 (15:21 -0500)
committer	Artur Adib <arturadib@gmail.com>
	Mon, 14 Nov 2011 20:21:18 +0000 (15:21 -0500)
		1	2
src/canvas.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
web/viewer.js	patch \|	diff1 \|	diff2 \|	blob \| history