Code

Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <sifnfors@faui02l.informatik.uni-erlangen.de>
Mon, 10 Sep 2007 08:43:49 +0000 (10:43 +0200)
committerFlorian Forster <sifnfors@faui02l.informatik.uni-erlangen.de>
Mon, 10 Sep 2007 08:43:49 +0000 (10:43 +0200)
commitc8ec3924c92ad3ca15229e8e923eaece64221337
tree5ce8e0fccf2f8a29e8c63f7df08034257509912b
parent8a35017c70b0fc1a3531a0b630071dedbbaa9372
parent59d8ed329bdad86d73152c00e9e582f1086cef8b
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

ChangeLog
ChangeLog