From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 26 Aug 2015 21:40:18 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~67
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=eab8493d114c7c209d90ac54edb7c8026c085747

Merge branch 'collectd-5.4' into collectd-5.5
---

eab8493d114c7c209d90ac54edb7c8026c085747
diff --cc src/exec.c
index 8d737cea,0445b14a..f080ad67
mode 100644,100755..100755
--- a/src/exec.c
+++ b/src/exec.c