Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 22 Apr 2008 11:17:05 +0000 (13:17 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 22 Apr 2008 11:17:05 +0000 (13:17 +0200)
commitbec5a6dda77c05eae27e5aeecdf601e573090cc5
tree914d389d5166c2c86285aac6cd626da584cd5fee
parent5aac2498eeacce2ab28302bca2103960a11474f7
parent9408d0b6c09eda66861826debd7f63a1e0cf5aea
Merge branch 'collectd-4.2' into collectd-4.3
ChangeLog