From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sat, 9 Jul 2016 13:39:43 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/amlethojalen/Chart.js into amlethojalen... 
X-Git-Tag: v2.2.0-rc.1~10^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f392639c2e3eb6d9b3aea7195e08f20c5297055;p=thirdparty%2FChart.js.git

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

6f392639c2e3eb6d9b3aea7195e08f20c5297055