From: Chart.js <chartjs-ci@users.noreply.github.com>
Date: Wed, 8 Feb 2017 20:14:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/origin/master' into release
X-Git-Tag: v2.5.0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57797a93cdd79ffd0f554c6053cc8d18b1fd98b4;p=thirdparty%2FChart.js.git

Merge remote-tracking branch 'remotes/origin/master' into release
---

57797a93cdd79ffd0f554c6053cc8d18b1fd98b4