Merge branch 'master' of git://github.com/mozilla/pdf.js.git into issue-863

author notmasteryet <async.processingjs@yahoo.com>

Fri, 9 Dec 2011 01:22:44 +0000 (19:22 -0600)

committer notmasteryet <async.processingjs@yahoo.com>

Fri, 9 Dec 2011 01:22:44 +0000 (19:22 -0600)
author notmasteryet <async.processingjs@yahoo.com>
Fri, 9 Dec 2011 01:22:44 +0000 (19:22 -0600)
committer notmasteryet <async.processingjs@yahoo.com>
Fri, 9 Dec 2011 01:22:44 +0000 (19:22 -0600)
diff --cc test/pdfs/.gitignore

index dd0dceced6dd5a5e30477a9e487a00592b79dadc,7a36acd582f4cbfb9a8a107cb8a2ce63c13b04f6..d3caa968ab8c22280e729389eedfc4d6a53732d1
--- 1/test/pdfs/.gitignore
--- 2/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -17,4 -17,4 +17,5 @@@
   !devicen.pdf
   !cmykjpeg.pdf
   !issue840.pdf
+ +!scan-bad.pdf
+ !freeculture.pdf
diff --cc test/test_manifest.json
Simple merge
author	notmasteryet <async.processingjs@yahoo.com>
	Fri, 9 Dec 2011 01:22:44 +0000 (19:22 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Fri, 9 Dec 2011 01:22:44 +0000 (19:22 -0600)
		1	2
test/pdfs/.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history