Merge branch 'remove-old-options' of https://github.com/kberg/dygraphs into remove...
authorRobert Konigsberg <konigsberg@google.com>
Sat, 24 Nov 2012 15:56:25 +0000 (10:56 -0500)
committerRobert Konigsberg <konigsberg@google.com>
Sat, 24 Nov 2012 15:56:25 +0000 (10:56 -0500)
commit95c6e8e68166281bd18aab32385ded0a1129464c
treeb549e24db57beea4f07506733a660f3cad18c629
parent242a8bc8c3282bf2334aa3e9254d6e99e3e2f2c2
parent6eb8e265c61d431af7431fcfc3c2d4b0186f36fb
Merge branch 'remove-old-options' of https://github.com/kberg/dygraphs into remove-old-options

Conflicts:
dygraph.js
Makefile