Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 22 Apr 2008 11:11:46 +0000 (13:11 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 22 Apr 2008 11:11:46 +0000 (13:11 +0200)
commit5aac2498eeacce2ab28302bca2103960a11474f7
tree809ba89a76f78b86f62184de87a59fac58306265
parent1584314f015f98abc61e74fdd6e47e200c8d02aa
parentc3e81ce5e320472d9d5789c092886e301905011c
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

ChangeLog
version-gen.sh
ChangeLog
configure.in
contrib/migrate-3-4.px