From: notmasteryet <async.processingjs@yahoo.com>
Date: Fri, 9 Dec 2011 01:22:44 +0000 (-0600)
Subject: Merge branch 'master' of git://github.com/mozilla/pdf.js.git into issue-863
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fa89ebe5375956b0648cd2b226070f1796a62b7e;p=pdf.js.git

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

Conflicts:
	test/pdfs/.gitignore
---

fa89ebe5375956b0648cd2b226070f1796a62b7e
diff --cc test/pdfs/.gitignore
index dd0dcec,7a36acd..d3caa96
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -17,4 -17,4 +17,5 @@@
  !devicen.pdf
  !cmykjpeg.pdf
  !issue840.pdf
 +!scan-bad.pdf
+ !freeculture.pdf