Code

Merge remote-tracking branch 'github/pr/2027' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Sun, 6 Nov 2016 19:40:36 +0000 (20:40 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 6 Nov 2016 19:40:36 +0000 (20:40 +0100)
commitf7e26c24f0f57dfc5057644cfd657f617a7bffb6
treee2ee5caef6780e0b3d56401313ae02d93606d12a
parent820020d0f3770806034c09a8c1500133632f210e
parent4c92b223198c6b3d6ba0b052f1baea1d33abf31e
Merge remote-tracking branch 'github/pr/2027' into collectd-5.5