From: Neal Nelson <neal@makalumedia.com>
Date: Tue, 11 Jan 2011 13:54:51 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/danvk/dygraphs
X-Git-Tag: v1.0.0~536^2~1^2~12
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=061d4e773eb897d07d59d2294f13bbfeab85d3bc;p=dygraphs.git

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

Conflicts:
	tests/zoom.html
---

061d4e773eb897d07d59d2294f13bbfeab85d3bc