Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 19:44:21 +0000 (21:44 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 19:44:21 +0000 (21:44 +0200)
commit37e18082cfb22491138e282074c5267df48dd8de
treea9cf797e44980b602f986d6be09820e0727965cb
parentc1f003b743598619e7a32083fa7bc41e06d82cf4
parent2bdaa472d6955a8c93c6aa77f11748d4c611558e
Merge branch 'collectd-4.10'
configure.in
src/collectd.conf.in
src/collectd.conf.pod