Merge pull request #95 from jviereck/master

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

Tue, 28 Jun 2011 21:56:10 +0000 (14:56 -0700)

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

Tue, 28 Jun 2011 21:56:10 +0000 (14:56 -0700)
author Chris Jones <jones.chris.g@gmail.com>
Tue, 28 Jun 2011 21:56:10 +0000 (14:56 -0700)
committer Chris Jones <jones.chris.g@gmail.com>
Tue, 28 Jun 2011 21:56:10 +0000 (14:56 -0700)
diff --cc fonts.js
Simple merge
diff --cc pdf.js
Simple merge
author	Chris Jones <jones.chris.g@gmail.com>
	Tue, 28 Jun 2011 21:56:10 +0000 (14:56 -0700)
committer	Chris Jones <jones.chris.g@gmail.com>
	Tue, 28 Jun 2011 21:56:10 +0000 (14:56 -0700)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history