Merge pull request #640 from notmasteryet/tree-30

author Artur Adib <arturadib@gmail.com>

Thu, 13 Oct 2011 16:32:47 +0000 (09:32 -0700)

committer Artur Adib <arturadib@gmail.com>

Thu, 13 Oct 2011 16:32:47 +0000 (09:32 -0700)
author Artur Adib <arturadib@gmail.com>
Thu, 13 Oct 2011 16:32:47 +0000 (09:32 -0700)
committer Artur Adib <arturadib@gmail.com>
Thu, 13 Oct 2011 16:32:47 +0000 (09:32 -0700)
diff --cc fonts.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	Artur Adib <arturadib@gmail.com>
	Thu, 13 Oct 2011 16:32:47 +0000 (09:32 -0700)
committer	Artur Adib <arturadib@gmail.com>
	Thu, 13 Oct 2011 16:32:47 +0000 (09:32 -0700)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history