From: Dan Vanderkam <dan@dygraphs.com>
Date: Tue, 5 Apr 2011 14:35:42 +0000 (-0400)
Subject: merge master
X-Git-Tag: v1.0.0~536
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=5bc3e265be640a29bc57d7d58c059322ab361d63;hp=5bc3e265be640a29bc57d7d58c059322ab361d63;p=dygraphs.git

merge master
---