From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Mon, 22 Jun 2015 19:10:52 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
X-Git-Tag: 2.0.0-alpha4~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc8526efe708584075227d819966362ebc62838e;p=thirdparty%2FChart.js.git

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

bc8526efe708584075227d819966362ebc62838e