Code

Merge branch 'collectd-4.6'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
commite4b8a186516b61f16d94a76db0aa102a3270d46c
tree20ebfc40e92cfaddbde4c7368b82ae2ce79cb84d
parentc811c48c7cdd847af34d86a459af34c110155576
parentb1d3856d265c13c3684feda9e06fd0c7738ac4d1
Merge branch 'collectd-4.6'
configure.in
src/collectd.conf.in