Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:45:14 +0000 (13:45 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:45:14 +0000 (13:45 +0200)
commitaf46a5f31a0e8d4279d63d8ca9232dbd433dfb25
tree674b3e6d58828fe51d7ba942939aea779ca2fc93
parent4dd90d1544d98c964e1beb4324b85edbd5907c84
parent53bd9256920f01cc5b835639c7e7971979ed3350
Merge branch 'collectd-4.3' into collectd-4.4