Merge remote-tracking branch 'origin/pr/691'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 8 Sep 2014 09:41:25 +0000 (11:41 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 8 Sep 2014 09:41:25 +0000 (11:41 +0200)
commit4e5c84e8251b25b11b5df7ef3b66259436bdea69
treef8d8b7d2bd132d95cf5567a6869ae1c309d0ab51
parent01f4a6eb87b83ccd2f77e0116e5bd09645c731d5
parentb2d20f9fa0735b15041bb4583a0ae16289cb717a
Merge remote-tracking branch 'origin/pr/691'
src/collectd.conf.in
src/collectd.conf.pod
src/configfile.c
src/plugin.c