From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Thu, 11 Jun 2015 07:06:07 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
X-Git-Tag: 2.0.0-alpha2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a76640c409f2682ee13986743ae6a3dcd276c7c9;p=thirdparty%2FChart.js.git

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

a76640c409f2682ee13986743ae6a3dcd276c7c9