From: wuchangming Date: Fri, 27 Nov 2015 00:50:55 +0000 (+0800) Subject: Merge remote-tracking branch 'nnnick/v2.0-dev' into v2.0-dev X-Git-Tag: 2.0.0-beta1~7^2~1^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a1c968105a26274b34e48120a58a4fb25ba1ea4;p=thirdparty%2FChart.js.git Merge remote-tracking branch 'nnnick/v2.0-dev' into v2.0-dev --- 5a1c968105a26274b34e48120a58a4fb25ba1ea4