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)
commit05f0c949e08dc94bb8cbaab4502a9e7c547c6d81
tree73678c45d99ff3e8f352a15715bea7804075e7ff
parentf9b5a82c0e67c25b47cc5a40b46ca2f1056c35f5
parentbfb3e0a44ba7eb76704389cd1515db9995944d41
Merge branch 'master' into kberg-work

Conflicts:
auto_tests/tests/multiple_axes-old.js
auto_tests/tests/per_series.js
dygraph-options-reference.js