From: Evert Timberg <evert.timberg@gmail.com>
Date: Sun, 29 Nov 2015 16:32:57 +0000 (-0500)
Subject: Merge branch 'v2.0-dev' into v2.0-beta1-docs
X-Git-Tag: 2.0.0-beta1~3^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F1713%2Fhead;p=thirdparty%2FChart.js.git

Merge branch 'v2.0-dev' into v2.0-beta1-docs

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

e5ee242dc60fae2b6a52f903e71c3b3a89e44862