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

Conflicts:
	dygraph.js
	tests/zoom.html

diff --cc dygraph.js
Simple merge

diff --cc tests/zoom.html
index cba823a,10b0457..1b60936
--- 1/tests/zoom.html
--- 2/tests/zoom.html
+++ b/tests/zoom.html
@@@ -40,8 -40,9 +40,9 @@@
              document.getElementById("div_g"),
              NoisyData, {
                errorBars: true,
 -              zoomCallback : function(minDate, maxDate, yRange) {
 -                showDimensions(minDate, maxDate, yRange);
 +            zoomCallback : function(minDate, maxDate, yRanges) {
 +                showDimensions(minDate, maxDate, yRanges); }
+               }
              }
            );
  
@@@ -65,9 -65,9 +66,9 @@@
          elem.innerHTML = "dateWindow : [" + first + ", "+ second + "]";
        }
  
-       function showYDimensions(values) {
 -      function showYDimensions(range) {
++      function showYDimensions(ranges) {
          var elem = document.getElementById("ydimensions");
-         elem.innerHTML = "valueRange : [" + values + "]";
 -        elem.innerHTML = "valueRange : [" + range + "]";
++        elem.innerHTML = "valueRange : [" + ranges + "]";
        }
  
        function zoomGraphX(minDate, maxDate) {