Merge branch 'master' of git://github.com/mozilla/pdf.js.git into forms-1

author notmasteryet <async.processingjs@yahoo.com>

Thu, 15 Dec 2011 21:35:44 +0000 (15:35 -0600)

committer notmasteryet <async.processingjs@yahoo.com>

Thu, 15 Dec 2011 21:35:44 +0000 (15:35 -0600)
author notmasteryet <async.processingjs@yahoo.com>
Thu, 15 Dec 2011 21:35:44 +0000 (15:35 -0600)
committer notmasteryet <async.processingjs@yahoo.com>
Thu, 15 Dec 2011 21:35:44 +0000 (15:35 -0600)
diff --cc src/core.js
Simple merge
diff --cc web/viewer.js
Simple merge
author	notmasteryet <async.processingjs@yahoo.com>
	Thu, 15 Dec 2011 21:35:44 +0000 (15:35 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Thu, 15 Dec 2011 21:35:44 +0000 (15:35 -0600)
		1	2
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
web/viewer.js	patch \|	diff1 \|	diff2 \|	blob \| history