From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sun, 8 May 2016 12:11:16 +0000 (-0400)
Subject: Merge branch 'master' into file-size-reduction
X-Git-Tag: v2.1.4~32^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b35b246414f8b757e8fde59876700c078fe52a40;p=thirdparty%2FChart.js.git

Merge branch 'master' into file-size-reduction
---

b35b246414f8b757e8fde59876700c078fe52a40