From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 3 Mar 2016 20:29:16 +0000 (+0100)
Subject: Merge branch 'Wshadow' into collectd-5.4
X-Git-Tag: collectd-5.5.2~6^2~30
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1eb3c043cb162ef198f86034cf7604be4a0a0d9c;p=collectd.git

Merge branch 'Wshadow' into collectd-5.4
---

1eb3c043cb162ef198f86034cf7604be4a0a0d9c