Merge pull request #1106 from arturadib/issue-1049

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

Fri, 3 Feb 2012 19:10:58 +0000 (11:10 -0800)

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

Fri, 3 Feb 2012 19:10:58 +0000 (11:10 -0800)
author Brendan Dahl <brendan.dahl@gmail.com>
Fri, 3 Feb 2012 19:10:58 +0000 (11:10 -0800)
committer Brendan Dahl <brendan.dahl@gmail.com>
Fri, 3 Feb 2012 19:10:58 +0000 (11:10 -0800)
diff --cc src/evaluator.js
Simple merge
diff --cc src/fonts.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
diff --cc web/viewer.js
Simple merge
author	Brendan Dahl <brendan.dahl@gmail.com>
	Fri, 3 Feb 2012 19:10:58 +0000 (11:10 -0800)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Fri, 3 Feb 2012 19:10:58 +0000 (11:10 -0800)
		1	2
src/evaluator.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history
web/viewer.js	patch \|	diff1 \|	diff2 \|	blob \| history