From: Vivien Nicolas <21@vingtetun.org>
Date: Tue, 18 Oct 2011 19:35:13 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b378314857692a6c3741a254fedfb11277ea33db;p=pdf.js.git

Merge remote branch 'upstream/master'
---

b378314857692a6c3741a254fedfb11277ea33db