From: Artur Adib <arturadib@gmail.com>
Date: Tue, 29 May 2012 16:16:57 +0000 (-0400)
Subject: merging upstream
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2a962f2c974ebc21e0c8015382ce6b7a09db25ec;p=pdf.js.git

merging upstream
---

2a962f2c974ebc21e0c8015382ce6b7a09db25ec