Merge branch 'master' into reorganize-points

author Dan Vanderkam <dan@dygraphs.com>

Wed, 25 Jul 2012 17:54:28 +0000 (13:54 -0400)

committer Dan Vanderkam <dan@dygraphs.com>

Wed, 25 Jul 2012 17:54:28 +0000 (13:54 -0400)
author Dan Vanderkam <dan@dygraphs.com>
Wed, 25 Jul 2012 17:54:28 +0000 (13:54 -0400)
committer Dan Vanderkam <dan@dygraphs.com>
Wed, 25 Jul 2012 17:54:28 +0000 (13:54 -0400)
diff --cc auto_tests/misc/local.html
Simple merge
diff --cc dygraph-canvas.js
Simple merge
author	Dan Vanderkam <dan@dygraphs.com>
	Wed, 25 Jul 2012 17:54:28 +0000 (13:54 -0400)
committer	Dan Vanderkam <dan@dygraphs.com>
	Wed, 25 Jul 2012 17:54:28 +0000 (13:54 -0400)
		1	2
auto_tests/misc/local.html	patch \|	diff1 \|	diff2 \|	blob \| history
dygraph-canvas.js	patch \|	diff1 \|	diff2 \|	blob \| history