Merge branch 'palette' of https://github.com/kberg/dygraphs into palette
authorRobert Konigsberg <konigsberg@gmail.com>
Fri, 28 Dec 2012 21:08:25 +0000 (16:08 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Fri, 28 Dec 2012 21:08:25 +0000 (16:08 -0500)
commitfe631b38a1490b6573018e266f512bce0207d2ab
tree928382788d95f8449ac624f288680b9b4baff1d5
parent58a18b025156273cc34cd7555f77369e1f924d74
parent0193e7efb2dec61f5bbfdce8e355babe87b7001f
Merge branch 'palette' of https://github.com/kberg/dygraphs into palette

Conflicts:
experimental/palette/options.js