From: Costa Tsaousis <costa@tsaousis.gr>
Date: Sat, 2 Jul 2016 16:36:21 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.3.0~96^2
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a1af544114eef80d62c8fda5f6eb9261e641ace;p=netdata.git

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

9a1af544114eef80d62c8fda5f6eb9261e641ace