Merge pull request #851 from ncb000gt/master

Prevent insertSteps and fmt from becoming global.

jquery.flot.js

@@ -561,7 +561,7 @@
                 ps = s.datapoints.pointsize;
                 points = s.datapoints.points;
 
-                insertSteps = s.lines.show && s.lines.steps;
+                var insertSteps = s.lines.show && s.lines.steps;
                 s.xaxis.used = s.yaxis.used = true;
                 
                 for (j = k = 0; j < data.length; ++j, k += ps) {

jquery.flot.time.js

@@ -272,6 +272,7 @@ for details.
                         var suffix = (opts.twelveHourClock) ? " %p" : "";
                         var hourCode = (opts.twelveHourClock) ? "%I" : "%H";
                         
+                        var fmt;
                         if (t < timeUnitSize.minute)
                             fmt = hourCode + ":%M:%S" + suffix;
                         else if (t < timeUnitSize.day) {