merge

diff --cc auto_tests/misc/local.html
index fbb225b,8be3777..f356fc5
--- 1/auto_tests/misc/local.html
--- 2/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>