Merge pull request #885 from notmasteryet/issue-884

author Artur Adib <arturadib@gmail.com>

Tue, 6 Dec 2011 19:59:07 +0000 (11:59 -0800)

committer Artur Adib <arturadib@gmail.com>

Tue, 6 Dec 2011 19:59:07 +0000 (11:59 -0800)
author Artur Adib <arturadib@gmail.com>
Tue, 6 Dec 2011 19:59:07 +0000 (11:59 -0800)
committer Artur Adib <arturadib@gmail.com>
Tue, 6 Dec 2011 19:59:07 +0000 (11:59 -0800)
diff --cc src/fonts.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	Artur Adib <arturadib@gmail.com>
	Tue, 6 Dec 2011 19:59:07 +0000 (11:59 -0800)
committer	Artur Adib <arturadib@gmail.com>
	Tue, 6 Dec 2011 19:59:07 +0000 (11:59 -0800)
		1	2
src/fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history