From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 13 Aug 2015 21:36:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1216'
X-Git-Tag: collectd-5.6.0~614
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aab7074831a2f67d9c7df8c72dd054f6cd7ddc27;p=collectd.git

Merge remote-tracking branch 'origin/pr/1216'
---

aab7074831a2f67d9c7df8c72dd054f6cd7ddc27