From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Thu, 22 Sep 2016 18:56:14 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: v2.3.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57d8ab2e03288b0f87e57e4139e6a9121ce65c21;p=thirdparty%2FChart.js.git

Merge branch 'master' into release
---

57d8ab2e03288b0f87e57e4139e6a9121ce65c21