Merge branch 'release/0.15' into wdtk

Conflicts:
	lib/tasks/stats.rake

1 files changed, 3 insertions, 3 deletions

diff --git a/public/javascripts/jquery.flot.axislabels.js b/public/javascripts/jquery.flot.axislabels.js
index d75b03ba9..c6f77aad4 100644
--- a/public/javascripts/jquery.flot.axislabels.js
+++ b/public/javascripts/jquery.flot.axislabels.js
@@ -61,7 +61,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
         this.height = 0;
     }
 
-    AxisLabel.prototype.delete = function() {
+    AxisLabel.prototype['delete'] = function() {
     };
 
 
@@ -144,7 +144,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
         }
     };
 
-    HtmlAxisLabel.prototype.delete = function() {
+    HtmlAxisLabel.prototype['delete'] = function() {
         if (this.elem) {
             this.elem.remove();
         }
@@ -357,7 +357,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                             axisLabels[axisName].width;
                         opts.labelHeight = axis.labelHeight;
                         opts.labelWidth = axis.labelWidth;
-                        axisLabels[axisName].delete();
+                        axisLabels[axisName]['delete']();
                         delete axisLabels[axisName];
                     }