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

Merge branch 'master' of github.com:kberg/dygraphs

Conflicts:
	auto_tests/tests/axis_labels.js
---

014a0f3441223be74be72ee47da276010931774f