From: Lighnat0r <Lighnat0r@gmail.com>
Date: Wed, 27 Apr 2016 20:47:23 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Lighnat0r/Chart.js
X-Git-Tag: 2.1.0~24^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5c38de5c306049fc9b04a09688adcae3fb1f383;p=thirdparty%2FChart.js.git

Merge branch 'master' of https://github.com/Lighnat0r/Chart.js
---

c5c38de5c306049fc9b04a09688adcae3fb1f383