Code

Merge remote-tracking branch 'github/pr/734'
authorFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:09:47 +0000 (07:09 -0700)
committerFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:09:47 +0000 (07:09 -0700)
commit0e363577f4d0a94bef1929f9d9829fb94765ec1e
tree0b53d8de5361119392ea41d962eac680c98fa20b
parent32d5f1af68d156c1888520dc18b4cdc7689dfca9
parent9faff71de9d74939223192766c93e1d18c2d1186
Merge remote-tracking branch 'github/pr/734'
src/collectd.conf.in
src/collectd.conf.pod