Merge branch 'master' of git://github.com/danvk/dygraphs into highlight3
authorKlaus Weidner <klausw@google.com>
Sat, 25 Feb 2012 20:18:26 +0000 (12:18 -0800)
committerKlaus Weidner <klausw@google.com>
Sat, 25 Feb 2012 20:18:26 +0000 (12:18 -0800)
commit5469113bc1d7bb38c9214e709c87598b7f6ef256
treef26c11885333e18c418818596d9f980c5590eaa5
parent240df72e34176516f2d3455e924d7e2d756db773
parent4270a2836fae730a6c3e0590d4a6fba7d63f86bc
Merge branch 'master' of git://github.com/danvk/dygraphs into highlight3

Conflicts:
auto_tests/tests/callback.js
dygraph-canvas.js
dygraph-options-reference.js
auto_tests/tests/callback.js
dygraph-canvas.js
dygraph-options-reference.js
dygraph.js