Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 2 Jan 2009 21:40:44 +0000 (22:40 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 2 Jan 2009 21:40:44 +0000 (22:40 +0100)
commit597adb008e5cb9b39bc925046d2aedc084ec2b9e
treef8424e2b85434a87e1adbeca7857a9b8380b0e9f
parent66b7c4bce4e628d8c11cc6762621f155bd68536d
parentd678cfe792f712ed190b65810f5fbcee08e15883
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

ChangeLog
version-gen.sh
ChangeLog