From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Wed, 14 Dec 2011 21:41:36 +0000 (-0800)
Subject: Merge upstream.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c2b91f12726f52f1860172dec676124e638f9819;p=pdf.js.git

Merge upstream.
---

c2b91f12726f52f1860172dec676124e638f9819
diff --cc test/test_manifest.json
index aab8388,fba8df6..7469db6
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -349,11 -349,10 +349,17 @@@
         "pageLimit": 3,
         "type": "eq"
      },
+     {  "id": "issue918",
+        "file": "pdfs/issue918.pdf",
+        "md5": "d582cc0f2592ae82936589ced2a47e55",
+        "rounds": 1,
+        "type": "eq"
++    },
 +    {  "id": "aboutstacks",
 +      "file": "pdfs/aboutstacks.pdf",
 +      "md5": "6e7c8416a293ba2d83bc8dd20c6ccf51",
 +      "rounds": 1,
 +      "link": true,
 +      "type": "eq"
      }
  ]