From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Wed, 25 May 2016 22:43:35 +0000 (-0400)
Subject: Merge branch 'master' into fix/2344
X-Git-Tag: v2.1.4~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2625%2Fhead;p=thirdparty%2FChart.js.git

Merge branch 'master' into fix/2344
---

93e5e52c65d2ecac32b8a9b54d4a284c2f6ee35e