Merge branch 'master' of https://github.com/kberg/dygraphs
authorDan Vanderkam <dan@dygraphs.com>
Thu, 31 Mar 2011 15:21:15 +0000 (11:21 -0400)
committerDan Vanderkam <dan@dygraphs.com>
Thu, 31 Mar 2011 15:21:15 +0000 (11:21 -0400)
1  2 
dygraph.js
tests/dygraph-many-points-benchmark.html
tests/per-series.html
tests/zoom.html

diff --cc dygraph.js
Simple merge
Simple merge
diff --cc tests/zoom.html
Simple merge