Merge pull request #339 from ironymark/master

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

Sat, 20 Aug 2011 03:29:32 +0000 (20:29 -0700)

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

Sat, 20 Aug 2011 03:29:32 +0000 (20:29 -0700)
author Chris Jones <jones.chris.g@gmail.com>
Sat, 20 Aug 2011 03:29:32 +0000 (20:29 -0700)
committer Chris Jones <jones.chris.g@gmail.com>
Sat, 20 Aug 2011 03:29:32 +0000 (20:29 -0700)
diff --cc fonts.js
Simple merge
diff --cc pdf.js
Simple merge
author	Chris Jones <jones.chris.g@gmail.com>
	Sat, 20 Aug 2011 03:29:32 +0000 (20:29 -0700)
committer	Chris Jones <jones.chris.g@gmail.com>
	Sat, 20 Aug 2011 03:29:32 +0000 (20:29 -0700)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history