From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Mon, 12 Dec 2011 23:34:11 +0000 (-0800)
Subject: Merge upstream.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3f8ba7d56a7a4267c0e7c2b936b515085d9932f5;p=pdf.js.git

Merge upstream.
---

3f8ba7d56a7a4267c0e7c2b936b515085d9932f5
diff --cc test/test_manifest.json
index 813fc27,8e80983..aab8388
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -341,12 -341,12 +341,19 @@@
         "pageLimit": 3,
         "type": "eq"
      },
-     {
-       "id": "aboutstacks",
+     {  "id": "issue919",
+        "file": "pdfs/issue919.pdf",
+        "md5": "3a1716a512aca4d7a8d6106bd4885d14",
+        "rounds": 1,
+        "link": true,
+        "pageLimit": 3,
+        "type": "eq"
++    },
++    {  "id": "aboutstacks",
 +      "file": "pdfs/aboutstacks.pdf",
 +      "md5": "6e7c8416a293ba2d83bc8dd20c6ccf51",
 +      "rounds": 1,
 +      "link": true,
 +      "type": "eq"
      }
  ]