Merge branch 'master' of http://github.com/adam-p/dygraphs

author Dan Vanderkam <danvdk@gmail.com>

Mon, 4 Oct 2010 14:16:31 +0000 (10:16 -0400)

committer Dan Vanderkam <danvdk@gmail.com>

Mon, 4 Oct 2010 14:16:31 +0000 (10:16 -0400)
author Dan Vanderkam <danvdk@gmail.com>
Mon, 4 Oct 2010 14:16:31 +0000 (10:16 -0400)
committer Dan Vanderkam <danvdk@gmail.com>
Mon, 4 Oct 2010 14:16:31 +0000 (10:16 -0400)
diff --cc dygraph-canvas.js
Simple merge
diff --cc dygraph.js
Simple merge
author	Dan Vanderkam <danvdk@gmail.com>
	Mon, 4 Oct 2010 14:16:31 +0000 (10:16 -0400)
committer	Dan Vanderkam <danvdk@gmail.com>
	Mon, 4 Oct 2010 14:16:31 +0000 (10:16 -0400)
		1	2
dygraph-canvas.js	patch \|	diff1 \|	diff2 \|	blob \| history
dygraph.js	patch \|	diff1 \|	diff2 \|	blob \| history