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

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

588b79964a5d7adbb961ebff49ea69676d18902b