Merge remote-tracking branch 'github/pr/1979'
authorFlorian Forster <octo@collectd.org>
Tue, 26 Sep 2017 09:57:34 +0000 (11:57 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 26 Sep 2017 09:57:34 +0000 (11:57 +0200)
commit44844d81e8324ab04dd130e84c9f5f989b1a1781
treec9c1d6a6851c6cdfd9f9e708aa25f68ad59abee4
parent82aace6f65e85ba568ab7b87227f908e08907db3
parente3d10ac940c7b6c666407e3960ba37a5b0363a24
Merge remote-tracking branch 'github/pr/1979'
src/collectd.conf.in
src/collectd.conf.pod