From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Thu, 12 May 2016 22:24:14 +0000 (-0400)
Subject: Merge branch 'iso_weekday' of https://github.com/tomduncalf/Chart.js into tomduncalf... 
X-Git-Tag: v2.1.3~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c209405e9edf33264b8eaea9cb1f48280fae2a5;p=thirdparty%2FChart.js.git

Merge branch 'iso_weekday' of https://github.com/tomduncalf/Chart.js into tomduncalf-iso_weekday

Conflicts:
	docs/01-Scales.md
---

8c209405e9edf33264b8eaea9cb1f48280fae2a5