From: Kalervo Kujala <kkujala@com>
Date: Wed, 28 Sep 2011 18:06:07 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cc5fbab7f99df4c917389457f292ab2e4aba232f;p=pdf.js.git

Merge remote-tracking branch 'upstream/master'
---

cc5fbab7f99df4c917389457f292ab2e4aba232f