Merge branch 'master' of https://github.com/kberg/dygraphs

author Dan Vanderkam <dan@dygraphs.com>

Thu, 31 Mar 2011 15:40:05 +0000 (11:40 -0400)

committer Dan Vanderkam <dan@dygraphs.com>

Thu, 31 Mar 2011 15:40:05 +0000 (11:40 -0400)
author Dan Vanderkam <dan@dygraphs.com>
Thu, 31 Mar 2011 15:40:05 +0000 (11:40 -0400)
committer Dan Vanderkam <dan@dygraphs.com>
Thu, 31 Mar 2011 15:40:05 +0000 (11:40 -0400)
diff --cc dygraph.js
Simple merge
diff --cc tests/zoom.html
Simple merge
author	Dan Vanderkam <dan@dygraphs.com>
	Thu, 31 Mar 2011 15:40:05 +0000 (11:40 -0400)
committer	Dan Vanderkam <dan@dygraphs.com>
	Thu, 31 Mar 2011 15:40:05 +0000 (11:40 -0400)
		1	2
dygraph.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/zoom.html	patch \|	diff1 \|	diff2 \|	blob \| history