Merge pull request #589 from notmasteryet/rgbt

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

Fri, 7 Oct 2011 18:56:10 +0000 (11:56 -0700)

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

Fri, 7 Oct 2011 18:56:10 +0000 (11:56 -0700)
author Brendan Dahl <brendan.dahl@gmail.com>
Fri, 7 Oct 2011 18:56:10 +0000 (11:56 -0700)
committer Brendan Dahl <brendan.dahl@gmail.com>
Fri, 7 Oct 2011 18:56:10 +0000 (11:56 -0700)
diff --cc pdf.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	Brendan Dahl <brendan.dahl@gmail.com>
	Fri, 7 Oct 2011 18:56:10 +0000 (11:56 -0700)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Fri, 7 Oct 2011 18:56:10 +0000 (11:56 -0700)
		1	2
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history