Merge pull request #1252 from notmasteryet/issue-1249

author Artur Adib <arturadib@gmail.com>

Wed, 29 Feb 2012 18:43:45 +0000 (10:43 -0800)

committer Artur Adib <arturadib@gmail.com>

Wed, 29 Feb 2012 18:43:45 +0000 (10:43 -0800)
author Artur Adib <arturadib@gmail.com>
Wed, 29 Feb 2012 18:43:45 +0000 (10:43 -0800)
committer Artur Adib <arturadib@gmail.com>
Wed, 29 Feb 2012 18:43:45 +0000 (10:43 -0800)
diff --cc src/fonts.js
Simple merge
diff --cc test/pdfs/.gitignore
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	Artur Adib <arturadib@gmail.com>
	Wed, 29 Feb 2012 18:43:45 +0000 (10:43 -0800)
committer	Artur Adib <arturadib@gmail.com>
	Wed, 29 Feb 2012 18:43:45 +0000 (10:43 -0800)
		1	2
src/fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/pdfs/.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history