Merge pull request #556 from notmasteryet/cid0

author vingtetun <21@vingtetun.org>

Tue, 4 Oct 2011 00:36:51 +0000 (17:36 -0700)

committer vingtetun <21@vingtetun.org>

Tue, 4 Oct 2011 00:36:51 +0000 (17:36 -0700)
author vingtetun <21@vingtetun.org>
Tue, 4 Oct 2011 00:36:51 +0000 (17:36 -0700)
committer vingtetun <21@vingtetun.org>
Tue, 4 Oct 2011 00:36:51 +0000 (17:36 -0700)
diff --cc pdf.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
diff --cc web/viewer.html
Simple merge
author	vingtetun <21@vingtetun.org>
	Tue, 4 Oct 2011 00:36:51 +0000 (17:36 -0700)
committer	vingtetun <21@vingtetun.org>
	Tue, 4 Oct 2011 00:36:51 +0000 (17:36 -0700)
		1	2
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history
web/viewer.html	patch \|	diff1 \|	diff2 \|	blob \| history