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)
commit014a0f3441223be74be72ee47da276010931774f
tree586525bdf5f37a3f69799d9ea4064ad57a3d1f3e
parentd43d407b8605f0a2ddb4fda2af32deb6f28beed0
parent901b2ebbe25c116c93550cfca91b0704d751d997
Merge branch 'master' of github.com:kberg/dygraphs

Conflicts:
auto_tests/tests/axis_labels.js
auto_tests/tests/axis_labels.js
dygraph.js