From: Evert Timberg <evert.timberg@gmail.com>
Date: Fri, 27 Nov 2015 22:37:14 +0000 (-0500)
Subject: Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into v2.0-dev
X-Git-Tag: 2.0.0-beta1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5244b7dbaee664525e26cbde0bc9d4cbb546a4c;p=thirdparty%2FChart.js.git

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

e5244b7dbaee664525e26cbde0bc9d4cbb546a4c