From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sun, 29 May 2016 01:17:30 +0000 (-0400)
Subject: Merge branch 'tooltip-improvements-and-tests' of https://github.com/nnnick/Chart... 
X-Git-Tag: v2.1.5~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2661%2Fhead;p=thirdparty%2FChart.js.git

Merge branch 'tooltip-improvements-and-tests' of https://github.com/nnnick/Chart.js into tooltip-improvements-and-tests

Conflicts:
	test/core.tooltip.tests.js
---

8e8cc5b61f86fa9a29e26902c024af7c003b513e