Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 06:52:56 +0000 (08:52 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 17 Sep 2009 06:52:56 +0000 (08:52 +0200)
commite21d0408e4e4001b8c66bb1ea7d41b890100d0f5
tree40ede4fa07a874a67a64b1c87e552c4027f9bbdd
parentbeb06e98c5aea9272c5972eee372b42c6abdd2b0
parenta690e4ac74e05f7294c22df8e0574e5e6f52f510
Merge branch 'collectd-4.7' into collectd-4.8
configure.in
contrib/collection3/etc/collection.conf
src/Makefile.am