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

Conflicts:
	dygraph.js

diff --cc dygraph.js
index b4f73c9,0989a1d..646159a
--- 1/dygraph.js
--- 2/dygraph.js
+++ b/dygraph.js
@@@ -2142,16 -2117,7 +2138,16 @@@ Dygraph.prototype.drawGraph_ = function
   *   indices are into the axes_ array.
   */
  Dygraph.prototype.computeYAxes_ = function() {
-   this.axes_ = [{}];  // always have at least one y-axis.
 +  var valueWindows;
 +  if (this.axes_ != undefined) {
 +    // Preserve valueWindow settings.
 +    valueWindows = [];
 +    for (var index = 0; index < this.axes_.length; index++) {
 +      valueWindows.push(this.axes_[index].valueWindow);
 +    }
 +  }
 +
+   this.axes_ = [{ yAxisId: 0 }];  // always have at least one y-axis.
    this.seriesToAxisMap_ = {};
  
    // Get a list of series names.