Merge branch 'master' of https://github.com/mozilla/pdf.js into cff

author Brendan Dahl <brendan.dahl@gmail.com>

Sun, 11 Mar 2012 03:22:02 +0000 (19:22 -0800)

committer Brendan Dahl <brendan.dahl@gmail.com>

Sun, 11 Mar 2012 03:22:02 +0000 (19:22 -0800)
author Brendan Dahl <brendan.dahl@gmail.com>
Sun, 11 Mar 2012 03:22:02 +0000 (19:22 -0800)
committer Brendan Dahl <brendan.dahl@gmail.com>
Sun, 11 Mar 2012 03:22:02 +0000 (19:22 -0800)
diff --cc src/fonts.js
Simple merge
diff --cc test/pdfs/.gitignore
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	Brendan Dahl <brendan.dahl@gmail.com>
	Sun, 11 Mar 2012 03:22:02 +0000 (19:22 -0800)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Sun, 11 Mar 2012 03:22:02 +0000 (19:22 -0800)
		1	2
src/fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/pdfs/.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history