Merge branch 'master' of github.com:kberg/dygraphs
authorRobert Konigsberg <konigsberg@gmail.com>
Fri, 4 Jan 2013 03:35:56 +0000 (22:35 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Fri, 4 Jan 2013 03:35:56 +0000 (22:35 -0500)
Conflicts:
auto_tests/tests/axis_labels.js

1  2 
auto_tests/tests/axis_labels.js
dygraph.js

Simple merge
diff --cc dygraph.js
Simple merge