From: Artur Adib <arturadib@gmail.com>
Date: Mon, 14 Nov 2011 20:21:18 +0000 (-0500)
Subject: Merge branch 'refs/heads/master' into text-select
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5c261b46ccd9bad668071eec71ff9e9c0a41087f;p=pdf.js.git

Merge branch 'refs/heads/master' into text-select

Conflicts:
	src/fonts.js
---

5c261b46ccd9bad668071eec71ff9e9c0a41087f