From: Kalervo Kujala <kkujala@com>
Date: Mon, 9 Jan 2012 18:39:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=37d2d82f59686653231943885abaf1cfbf7ebec9;p=pdf.js.git

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

37d2d82f59686653231943885abaf1cfbf7ebec9