From: Ben Dixon <bendxn@gmail.com>
Date: Tue, 27 Jan 2015 00:49:17 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.0.2~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F867%2Fhead;p=thirdparty%2FChart.js.git

Merge remote-tracking branch 'upstream/master'
---

13396c72b3cc19dd659862fe30a0e75abb26b2e8