From: Dan Vanderkam <danvdk@gmail.com>
Date: Mon, 17 Feb 2014 22:38:41 +0000 (-0500)
Subject: merge
X-Git-Tag: v1.1.0~66
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=d16d197c2d63be4a36f2639040f110e2ccf20c7f;p=dygraphs.git

merge
---

d16d197c2d63be4a36f2639040f110e2ccf20c7f
diff --cc auto_tests/misc/local.html
index fbb225b,8be3777..f356fc5
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@@ -59,7 -59,7 +59,8 @@@
    -->
    <script type="text/javascript" src="../tests/to_dom_coords.js"></script>
    <script type="text/javascript" src="../tests/resize.js"></script>
 +  <script type="text/javascript" src="../tests/plugins_legend.js"></script>
+   <script type="text/javascript" src="../tests/two_digit_years.js"></script>
    <script type="text/javascript" src="../tests/update_options.js"></script>
    <script type="text/javascript" src="../tests/update_while_panning.js"></script>
    <script type="text/javascript" src="../tests/utils_test.js"></script>