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

Merge remote branch 'upstream/master'
---

fa4f81e5224eea17818eb75c8362ab26116a93ec