From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sun, 5 Jun 2016 00:49:19 +0000 (-0400)
Subject: Merge branch 'Tarqwyn-multiline_labels'
X-Git-Tag: v2.1.5~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d3dc12372ded0bc7a73d3b49455ac530457fbff;p=thirdparty%2FChart.js.git

Merge branch 'Tarqwyn-multiline_labels'
---

7d3dc12372ded0bc7a73d3b49455ac530457fbff