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

author Neal Nelson <neal@makalumedia.com>

Thu, 18 Nov 2010 09:59:07 +0000 (10:59 +0100)

committer Neal Nelson <neal@makalumedia.com>

Thu, 18 Nov 2010 09:59:07 +0000 (10:59 +0100)
author Neal Nelson <neal@makalumedia.com>
Thu, 18 Nov 2010 09:59:07 +0000 (10:59 +0100)
committer Neal Nelson <neal@makalumedia.com>
Thu, 18 Nov 2010 09:59:07 +0000 (10:59 +0100)
diff --cc dygraph.js
Simple merge
diff --cc tests/zoom.html
Simple merge
author	Neal Nelson <neal@makalumedia.com>
	Thu, 18 Nov 2010 09:59:07 +0000 (10:59 +0100)
committer	Neal Nelson <neal@makalumedia.com>
	Thu, 18 Nov 2010 09:59:07 +0000 (10:59 +0100)
		1	2
dygraph.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/zoom.html	patch \|	diff1 \|	diff2 \|	blob \| history