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)
Conflicts:
experimental/palette/options.js


Trivial merge