From: Kalervo Kujala <kkujala@com>
Date: Sat, 29 Oct 2011 08:40:18 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d7c2e79cb8fcbfba01381990b518cfa0c53e27cb;p=pdf.js.git

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

d7c2e79cb8fcbfba01381990b518cfa0c53e27cb