From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Sat, 16 Apr 2016 23:13:23 +0000 (-0500)
Subject: Merge branch 'master' into v2.0-dev
X-Git-Tag: 2.1.0~80^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af1adf6b84f6494f8b448a58df6d49f2bdff9165;p=thirdparty%2FChart.js.git

Merge branch 'master' into v2.0-dev
---

af1adf6b84f6494f8b448a58df6d49f2bdff9165