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)
1  2 
configure.in
contrib/collection3/etc/collection.conf
src/Makefile.am

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge