From: Robert Konigsberg <konigsberg@gmail.com>
Date: Fri, 4 Jan 2013 03:39:40 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/danvk/dygraphs
X-Git-Tag: v1.0.0~131^2~1
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=600da35ccf7fda98f16ba16037c80451ebca9cf5;p=dygraphs.git

Merge branch 'master' of https://github.com/danvk/dygraphs

Conflicts:
	auto_tests/tests/axis_labels.js
	dygraph-options.js
	plugins/axes.js
---

600da35ccf7fda98f16ba16037c80451ebca9cf5