Merge branch 'collectd-4.5'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 21:18:28 +0000 (23:18 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 21:18:28 +0000 (23:18 +0200)
commit011068c93883652d9729a26e0157e94811952609
treef35b7ca63a864b0b3a694aba3e961a491091b27f
parenta06380ec6096a4fff34505d37f60431bf0b532ea
parentb2a7cb85e09f67cbaf114eb64bf736f3a24d9d55
Merge branch 'collectd-4.5'
src/collectd.conf.pod