Merge pull request #1238 from tvonclef/master

Updating jquery.flot.d.ts. Fixing type for seriesOptions.color

flot/jquery.flot.d.ts

@@ -72,7 +72,7 @@ declare module jquery.flot {
     }
 
     interface seriesOptions {
-        color?: number;
+        color?: any;            // color or number
         label?: string;
         lines?: linesOptions;
         bars?: barsOptions;