From: Costa Tsaousis <costa@tsaousis.gr>
Date: Fri, 13 May 2016 16:50:53 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master' into registry
X-Git-Tag: v1.2.0~7^2~17
X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=commitdiff_plain;h=ac9eb75046a2136a1835c7e3d89aae99d58901c0

Merge remote-tracking branch 'upstream/master' into registry
---

ac9eb75046a2136a1835c7e3d89aae99d58901c0