Merge pull request #226 from andreasgal/staging

author Chris Jones <jones.chris.g@gmail.com>

Sat, 9 Jul 2011 23:51:04 +0000 (16:51 -0700)

committer Chris Jones <jones.chris.g@gmail.com>

Sat, 9 Jul 2011 23:51:04 +0000 (16:51 -0700)
author Chris Jones <jones.chris.g@gmail.com>
Sat, 9 Jul 2011 23:51:04 +0000 (16:51 -0700)
committer Chris Jones <jones.chris.g@gmail.com>
Sat, 9 Jul 2011 23:51:04 +0000 (16:51 -0700)
diff --cc fonts.js
Simple merge
diff --cc pdf.js
Simple merge
author	Chris Jones <jones.chris.g@gmail.com>
	Sat, 9 Jul 2011 23:51:04 +0000 (16:51 -0700)
committer	Chris Jones <jones.chris.g@gmail.com>
	Sat, 9 Jul 2011 23:51:04 +0000 (16:51 -0700)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history