From: Dan Vanderkam <dan@dygraphs.com>
Date: Mon, 6 Jun 2011 13:33:55 +0000 (-0400)
Subject: fix merge issue
X-Git-Tag: v1.0.0~472
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=fac494f30a31bb8fff4d688c4b9964cbc8741318;hp=fac494f30a31bb8fff4d688c4b9964cbc8741318;p=dygraphs.git

fix merge issue
---