From: Robert Konigsberg <konigsberg@google.com>
Date: Thu, 29 Nov 2012 20:13:14 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/danvk/dygraphs into new-series-option
X-Git-Tag: v1.0.0~157^2
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=c70fe730d3e8a4ff32f9371d95a7894441f2f671;p=dygraphs.git

Merge branch 'master' of https://github.com/danvk/dygraphs into new-series-option

Conflicts:
	Makefile
	dygraph.js
---

c70fe730d3e8a4ff32f9371d95a7894441f2f671