Merge pull request #465 from anton-ryzhov/master

author Dave Methvin <dave.methvin@gmail.com>

Thu, 25 Aug 2011 19:22:47 +0000 (12:22 -0700)

committer Dave Methvin <dave.methvin@gmail.com>

Thu, 25 Aug 2011 19:22:47 +0000 (12:22 -0700)
author Dave Methvin <dave.methvin@gmail.com>
Thu, 25 Aug 2011 19:22:47 +0000 (12:22 -0700)
committer Dave Methvin <dave.methvin@gmail.com>
Thu, 25 Aug 2011 19:22:47 +0000 (12:22 -0700)
diff --cc src/core.js
Simple merge
diff --cc test/unit/core.js
Simple merge
author	Dave Methvin <dave.methvin@gmail.com>
	Thu, 25 Aug 2011 19:22:47 +0000 (12:22 -0700)
committer	Dave Methvin <dave.methvin@gmail.com>
	Thu, 25 Aug 2011 19:22:47 +0000 (12:22 -0700)
		1	2
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/unit/core.js	patch \|	diff1 \|	diff2 \|	blob \| history