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

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

Conflicts:
	src/core/core.legend.js
---

924a5d0abcc6d2889cd499ff2cc2812b438c873d