Merge branch 'master' of github.com:kberg/dygraphs into axis-label-font-size
authorRobert Konigsberg <konigsberg@gmail.com>
Mon, 31 Dec 2012 20:11:11 +0000 (15:11 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Mon, 31 Dec 2012 20:11:11 +0000 (15:11 -0500)
commit7ff98630ca7cc2760e2115ad2372053184d3e717
treea7f5e362b914d1e450c5834d7428b4cc078a49e9
parent3a84670d430444e0fb4b89c6991c3787f2f329dc
parent901b2ebbe25c116c93550cfca91b0704d751d997
Merge branch 'master' of github.com:kberg/dygraphs into axis-label-font-size

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