From: Robert Konigsberg <konigsberg@gmail.com>
Date: Fri, 28 Dec 2012 21:08:25 +0000 (-0500)
Subject: Merge branch 'palette' of https://github.com/kberg/dygraphs into palette
X-Git-Tag: v1.0.0~139^2~13
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=fe631b38a1490b6573018e266f512bce0207d2ab;p=dygraphs.git

Merge branch 'palette' of https://github.com/kberg/dygraphs into palette

Conflicts:
	experimental/palette/options.js
---

fe631b38a1490b6573018e266f512bce0207d2ab