Merge branch 'master' of https://github.com/danvk/dygraphs
authorRobert Konigsberg <konigsberg@gmail.com>
Fri, 4 Jan 2013 03:39:40 +0000 (22:39 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Fri, 4 Jan 2013 03:39:40 +0000 (22:39 -0500)
commit600da35ccf7fda98f16ba16037c80451ebca9cf5
treec095114c783ddba113419a5b06dd8da52153dab2
parent014a0f3441223be74be72ee47da276010931774f
parentcc5806e1618220ee0eeedbeae6373325addf979d
Merge branch 'master' of https://github.com/danvk/dygraphs

Conflicts:
auto_tests/tests/axis_labels.js
dygraph-options.js
plugins/axes.js