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

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

b4d8f541bd49a1aa1bee9abf2341c3871b01b0ef