From: William Entriken <github.com@phor.net>
Date: Mon, 29 Dec 2014 20:41:39 +0000 (-0500)
Subject: Merge pull request #5 from fulldecent/origin/patch-2
X-Git-Tag: v1.0.1~16^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F650%2Fhead;p=thirdparty%2FChart.js.git

Merge pull request #5 from fulldecent/origin/patch-2

Origin/patch 2
---

718dcd1a2b68ec5e083fd3ef7e9a7d9bafd5be28