Merge pull request #1009 from notmasteryet/issue-1001

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

Sat, 31 Dec 2011 02:25:19 +0000 (18:25 -0800)

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

Sat, 31 Dec 2011 02:25:19 +0000 (18:25 -0800)
author Brendan Dahl <brendan.dahl@gmail.com>
Sat, 31 Dec 2011 02:25:19 +0000 (18:25 -0800)
committer Brendan Dahl <brendan.dahl@gmail.com>
Sat, 31 Dec 2011 02:25:19 +0000 (18:25 -0800)
diff --cc src/core.js
Simple merge
diff --cc src/function.js
Simple merge
diff --cc test/test_manifest.json
Simple merge
author	Brendan Dahl <brendan.dahl@gmail.com>
	Sat, 31 Dec 2011 02:25:19 +0000 (18:25 -0800)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Sat, 31 Dec 2011 02:25:19 +0000 (18:25 -0800)
		1	2
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/function.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_manifest.json	patch \|	diff1 \|	diff2 \|	blob \| history