Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:43:27 +0000 (17:43 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:43:27 +0000 (17:43 +0200)
commitc74b709edf61a3b7dfc24032f609956f0feb56e7
treebd4e6029cdec9af9b5450bad855dfb1d1c4d19df
parentd5e428c8fc7e1423e3082492274547c708b1cec3
parentd8a27138e0fc455088443ca034942a00c3b4eecd
Merge branch 'collectd-4.2' into collectd-4.3