From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Tue, 12 May 2015 23:24:09 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
X-Git-Tag: v2.0-alpha~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69b1239aa174a842fdee29bc8c88cf9fc49b37ab;p=thirdparty%2FChart.js.git

Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
---

69b1239aa174a842fdee29bc8c88cf9fc49b37ab