Merge branch 'master' into kberg-work
authorRobert Konigsberg <konigsberg@gmail.com>
Sat, 6 Dec 2014 16:21:56 +0000 (11:21 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Sat, 6 Dec 2014 16:21:56 +0000 (11:21 -0500)
Conflicts:
auto_tests/tests/multiple_axes-old.js

1  2 
auto_tests/tests/per_series.js
dygraph-options-reference.js

Simple merge
Simple merge