From: notmasteryet <async.processingjs@yahoo.com>
Date: Thu, 19 Jan 2012 23:46:48 +0000 (-0600)
Subject: Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=016fd3282e689816c4920c12879b7c927d55f3c7;p=pdf.js.git

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6

Conflicts:
	test/pdfs/.gitignore
---

016fd3282e689816c4920c12879b7c927d55f3c7
diff --cc test/pdfs/.gitignore
index 2817f17,1aae828..e092649
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -22,4 -22,4 +22,5 @@@
  !issue918.pdf
  !smaskdim.pdf
  !type4psfunc.pdf
 +!S2.pdf
+ !zerowidthline.pdf