From: Vivien Nicolas <21@vingtetun.org>
Date: Tue, 23 Aug 2011 14:40:49 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=62e7d2f608180b9f2d4b9d538ec50ca15a989afd;p=pdf.js.git

Merge remote branch 'upstream/master'

Conflicts:
	web/viewer.js
---

62e7d2f608180b9f2d4b9d538ec50ca15a989afd