From: Vivien Nicolas <21@vingtetun.org>
Date: Thu, 25 Aug 2011 00:46:05 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d02a84ea5f01ad464be0874864a0debd269c49b4;p=pdf.js.git

Merge remote branch 'upstream/master'
---

d02a84ea5f01ad464be0874864a0debd269c49b4