Merge branch 'master' into remove-old-options
authorRobert Konigsberg <konigsberg@google.com>
Sat, 24 Nov 2012 15:45:26 +0000 (10:45 -0500)
committerRobert Konigsberg <konigsberg@google.com>
Sat, 24 Nov 2012 15:55:23 +0000 (10:55 -0500)
commit242a8bc8c3282bf2334aa3e9254d6e99e3e2f2c2
tree3fede79d6883b8bd137e47130f38f73cea71629e
parent404804efb919529cc9ac976019cfc2aef16aa908
parent5daa462d93e850a64a7f6644afb8122336ccf84d
Merge branch 'master' into remove-old-options

Conflicts:
dygraph-options.js
dygraph.js
dygraph-options.js
dygraph.js