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:46:38 +0000 (10:46 -0500)
commit6eb8e265c61d431af7431fcfc3c2d4b0186f36fb
tree48a3ccadf10a723cfc3ddc6cdfb99c1adf376157
parent404804efb919529cc9ac976019cfc2aef16aa908
parent5daa462d93e850a64a7f6644afb8122336ccf84d
Merge branch 'master' into remove-old-options

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