Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 6 Sep 2009 10:15:06 +0000 (12:15 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 6 Sep 2009 10:15:06 +0000 (12:15 +0200)
commit9d15d1058b93acb7be041934acfe76548539041a
treefec91ba8303ee2786dd1b472e031b7cd8fa36a2a
parentcce535f9fbb96dce74e94c5077bae08b1be8b2c4
parent2438b95b7f7930902d021aa749308ea8ae5652ca
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
configure.in
src/iptables.c
configure.in
contrib/collection.cgi
contrib/collection3/etc/collection.conf
src/Makefile.am
src/iptables.c
src/powerdns.c