From: paulfantom <paulfantom@gmail.com>
Date: Tue, 21 Jun 2016 08:07:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/firehol/master'
X-Git-Tag: v1.3.0~115^2
X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=commitdiff_plain;h=ee2308b59fc3737c022ba03856cdb5e7dd1cefa4

Merge remote-tracking branch 'remotes/firehol/master'
---

ee2308b59fc3737c022ba03856cdb5e7dd1cefa4