From: Robert Konigsberg <konigsberg@gmail.com>
Date: Sat, 6 Dec 2014 16:21:56 +0000 (-0500)
Subject: Merge branch 'master' into kberg-work
X-Git-Tag: v2.0.0~83^2~1
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=05f0c949e08dc94bb8cbaab4502a9e7c547c6d81;p=dygraphs.git

Merge branch 'master' into kberg-work

Conflicts:
	auto_tests/tests/multiple_axes-old.js
---

05f0c949e08dc94bb8cbaab4502a9e7c547c6d81