Merge pull request #990 from notmasteryet/concurload

author Brendan Dahl <brendan.dahl@gmail.com>

Fri, 30 Dec 2011 17:40:12 +0000 (09:40 -0800)

committer Brendan Dahl <brendan.dahl@gmail.com>

Fri, 30 Dec 2011 17:40:12 +0000 (09:40 -0800)
author Brendan Dahl <brendan.dahl@gmail.com>
Fri, 30 Dec 2011 17:40:12 +0000 (09:40 -0800)
committer Brendan Dahl <brendan.dahl@gmail.com>
Fri, 30 Dec 2011 17:40:12 +0000 (09:40 -0800)
diff --cc src/core.js
Simple merge
diff --cc src/obj.js
Simple merge
diff --cc web/viewer.js
Simple merge
author	Brendan Dahl <brendan.dahl@gmail.com>
	Fri, 30 Dec 2011 17:40:12 +0000 (09:40 -0800)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Fri, 30 Dec 2011 17:40:12 +0000 (09:40 -0800)
		1	2
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/obj.js	patch \|	diff1 \|	diff2 \|	blob \| history
web/viewer.js	patch \|	diff1 \|	diff2 \|	blob \| history