From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sat, 9 Jul 2016 14:02:08 +0000 (-0400)
Subject: Merge branch 'amlethojalen-master'
X-Git-Tag: v2.2.0-rc.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72813d51122090984cb0ee8dc46cfdfacd778983;p=thirdparty%2FChart.js.git

Merge branch 'amlethojalen-master'
---

72813d51122090984cb0ee8dc46cfdfacd778983