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

Merge remote branch 'upstream/master'
---

a954769929f439f52c52b1c91750e21a3daa3b19