From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sun, 24 Apr 2016 00:06:18 +0000 (-0400)
Subject: Merge branch 'master' into feature/pan-support
X-Git-Tag: 2.1.0~7^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4a06f6e3408beffb18633be1eb08b0f24c41146;p=thirdparty%2FChart.js.git

Merge branch 'master' into feature/pan-support

Conflicts:
	src/core/core.controller.js
---

b4a06f6e3408beffb18633be1eb08b0f24c41146