Merge branch 'master' of http://github.com/nealie/dygraphs

author Dan Vanderkam <danvk@google.com>

Fri, 8 Oct 2010 14:36:53 +0000 (10:36 -0400)

committer Dan Vanderkam <danvk@google.com>

Fri, 8 Oct 2010 14:36:53 +0000 (10:36 -0400)
author Dan Vanderkam <danvk@google.com>
Fri, 8 Oct 2010 14:36:53 +0000 (10:36 -0400)
committer Dan Vanderkam <danvk@google.com>
Fri, 8 Oct 2010 14:36:53 +0000 (10:36 -0400)
diff --cc dygraph.js
Simple merge
diff --cc tests/steps.html
Simple merge
author	Dan Vanderkam <danvk@google.com>
	Fri, 8 Oct 2010 14:36:53 +0000 (10:36 -0400)
committer	Dan Vanderkam <danvk@google.com>
	Fri, 8 Oct 2010 14:36:53 +0000 (10:36 -0400)
		1	2
dygraph.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/steps.html	patch \|	diff1 \|	diff2 \|	blob \| history