Merge pull request #214 from saebekassebil/master

author Andreas Gal <andreas.gal@gmail.com>

Fri, 8 Jul 2011 07:59:00 +0000 (00:59 -0700)

committer Andreas Gal <andreas.gal@gmail.com>

Fri, 8 Jul 2011 07:59:00 +0000 (00:59 -0700)
author Andreas Gal <andreas.gal@gmail.com>
Fri, 8 Jul 2011 07:59:00 +0000 (00:59 -0700)
committer Andreas Gal <andreas.gal@gmail.com>
Fri, 8 Jul 2011 07:59:00 +0000 (00:59 -0700)
diff --cc fonts.js
Simple merge
diff --cc pdf.js
Simple merge
author	Andreas Gal <andreas.gal@gmail.com>
	Fri, 8 Jul 2011 07:59:00 +0000 (00:59 -0700)
committer	Andreas Gal <andreas.gal@gmail.com>
	Fri, 8 Jul 2011 07:59:00 +0000 (00:59 -0700)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history