Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs

author notmasteryet <async.processingjs@yahoo.com>

Fri, 16 Sep 2011 00:50:55 +0000 (19:50 -0500)

committer notmasteryet <async.processingjs@yahoo.com>

Fri, 16 Sep 2011 00:50:55 +0000 (19:50 -0500)
author notmasteryet <async.processingjs@yahoo.com>
Fri, 16 Sep 2011 00:50:55 +0000 (19:50 -0500)
committer notmasteryet <async.processingjs@yahoo.com>
Fri, 16 Sep 2011 00:50:55 +0000 (19:50 -0500)
diff --cc fonts.js

index e8d62908452a4b4cb7218d0efe996531440dc11f,7d51e2c4b2acddf272cca0f70be6a6c47c6fefa9..4f107ef80d1cedf1405475eff28334ae9fdff472

mode 100755,100644..100644
--- 1/fonts.js
--- 2/fonts.js
+++ b/fonts.js
diff --cc pdf.js
Simple merge
author	notmasteryet <async.processingjs@yahoo.com>
	Fri, 16 Sep 2011 00:50:55 +0000 (19:50 -0500)
committer	notmasteryet <async.processingjs@yahoo.com>
	Fri, 16 Sep 2011 00:50:55 +0000 (19:50 -0500)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history