Merge branch 'master' into unzoom

diff --combined auto_tests/misc/local.html
index 58ebc33,bf2756f..9ef2aa2
--- 1/auto_tests/misc/local.html
--- 2/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@@ -33,11 -33,11 +33,12 @@@
    <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>
    <script type="text/javascript" src="../tests/per_series.js"></script>
 +  <script type="text/javascript" src="../tests/plugins.js"></script>
    <script type="text/javascript" src="../tests/range_selector.js"></script>
    <script type="text/javascript" src="../tests/range_tests.js"></script>
    <script type="text/javascript" src="../tests/rolling_average.js"></script>

diff --combined dygraph.js
index 616fb31,c867c66..77f9ab4
--- 1/dygraph.js
--- 2/dygraph.js
+++ b/dygraph.js
@@@ -282,8 -282,6 +282,8 @@@ Dygraph.DEFAULT_ATTRS = 
      Dygraph.Plotters.linePlotter
    ],
  
 +  plugins: [ ],
 +
    // per-axis options
    axes: {
      x: {
@@@ -454,9 -452,8 +454,9 @@@ Dygraph.prototype.__init__ = function(d
  
    // Activate plugins.
    this.plugins_ = [];
 -  for (var i = 0; i < Dygraph.PLUGINS.length; i++) {
 -    var Plugin = Dygraph.PLUGINS[i];
 +  var plugins = Dygraph.PLUGINS.concat(this.getOption('plugins'));
 +  for (var i = 0; i < plugins.length; i++) {
 +    var Plugin = plugins[i];
      var pluginInstance = new Plugin();
      var pluginDict = {
        plugin: pluginInstance,
@@@ -601,6 -598,9 +601,9 @@@ Dygraph.prototype.getOption = function(
    return this.attr_(name, opt_seriesName);
  };
  
+ Dygraph.prototype.getOptionForAxis = function(name, axis) {
+   return this.attributes_.getForAxis(name, axis);
+ }
  /**
   * @private
   * @param  String} axis The name of the axis (i.e. 'x', 'y' or 'y2')
@@@ -1462,10 -1462,8 +1465,8 @@@ Dygraph.prototype.doZoomY_ = function(l
  /**
   * Reset the zoom to the original view coordinates. This is the same as
   * double-clicking on the graph.
-  *
-  * @private
   */
- Dygraph.prototype.doUnzoom_ = function() {
+ Dygraph.prototype.resetZoom = function() {
    var dirty = false, dirtyX = false, dirtyY = false;
    if (this.dateWindow_ !== null) {
      dirty = true;