From: unknown <slinhart@knights.ucf.edu>
Date: Sun, 17 Jul 2016 00:59:22 +0000 (-0600)
Subject: Merge remote-tracking branch 'chartjs-origin/master'
X-Git-Tag: v2.2.0-rc.2~3^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7733b222158004b1be314fc1f2f672e4cd8099e;p=thirdparty%2FChart.js.git

Merge remote-tracking branch 'chartjs-origin/master'
---

d7733b222158004b1be314fc1f2f672e4cd8099e