From: Robert Becker <robert@rbecker.eu>
Date: Thu, 4 Feb 2016 09:38:35 +0000 (+0100)
Subject: Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev
X-Git-Tag: v2.0.0~49^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df218ead824497edfd75220f5b8bc67c03ad1fd6;p=thirdparty%2FChart.js.git

Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev

# Conflicts:
#	src/core/core.helpers.js
---

df218ead824497edfd75220f5b8bc67c03ad1fd6