Merge branch 'master' into chart-labels
authorDan Vanderkam <dan@dygraphs.com>
Mon, 4 Apr 2011 03:17:42 +0000 (23:17 -0400)
committerDan Vanderkam <dan@dygraphs.com>
Mon, 4 Apr 2011 03:17:42 +0000 (23:17 -0400)
1  2 
docs/index.html
dygraph.js

diff --cc docs/index.html
Simple merge
diff --cc dygraph.js
Simple merge