Merge pull request #909 from notmasteryet/tree-45

author Brendan Dahl <brendan.dahl@gmail.com>

Sat, 10 Dec 2011 01:22:47 +0000 (17:22 -0800)

committer Brendan Dahl <brendan.dahl@gmail.com>

Sat, 10 Dec 2011 01:22:47 +0000 (17:22 -0800)
author Brendan Dahl <brendan.dahl@gmail.com>
Sat, 10 Dec 2011 01:22:47 +0000 (17:22 -0800)
committer Brendan Dahl <brendan.dahl@gmail.com>
Sat, 10 Dec 2011 01:22:47 +0000 (17:22 -0800)
diff --cc src/fonts.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	Brendan Dahl <brendan.dahl@gmail.com>
	Sat, 10 Dec 2011 01:22:47 +0000 (17:22 -0800)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Sat, 10 Dec 2011 01:22:47 +0000 (17:22 -0800)
		1	2
src/fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history