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

diff --combined auto_tests/misc/local.html
index f34d18b,1604e8e..e168de0
--- 1/auto_tests/misc/local.html
--- 2/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@@ -30,11 -30,13 +30,12 @@@
    <script type="text/javascript" src="../tests/dygraph-options-tests.js"></script>
    <script type="text/javascript" src="../tests/error_bars.js"></script>
    <script type="text/javascript" src="../tests/formats.js"></script>
+   <script type="text/javascript" src="../tests/grid_per_axis.js"></script>
    <script type="text/javascript" src="../tests/interaction_model.js"></script>
    <script type="text/javascript" src="../tests/missing_points.js"></script>
    <script type="text/javascript" src="../tests/multi_csv.js"></script>
    <script type="text/javascript" src="../tests/multiple_axes.js"></script>
    <script type="text/javascript" src="../tests/multiple_axes-old.js"></script>
 -  <script type="text/javascript" src="../tests/numeric-labels.js"></script>
    <script type="text/javascript" src="../tests/no_hours.js"></script>
    <script type="text/javascript" src="../tests/parser.js"></script>
    <script type="text/javascript" src="../tests/pathological_cases.js"></script>