Merge branch 'pr/1970'
authorFlorian Forster <octo@collectd.org>
Thu, 6 Oct 2016 20:41:24 +0000 (22:41 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 6 Oct 2016 20:41:24 +0000 (22:41 +0200)
commit7f8a8111b26ffaed85a4a48ba874614df3a07f1b
tree44313f8dc09e9e62720ca0d2dcaae6814464b7da
parent319e18c6784eb653990ac277ef45bf482d29fdc5
parent4a4abbb0a9412e9e43dc02da7b51a1f5f7ec69bb
Merge branch 'pr/1970'
README
src/collectd.conf.in
src/collectd.conf.pod