Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 2 Oct 2009 07:50:20 +0000 (09:50 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 2 Oct 2009 07:50:20 +0000 (09:50 +0200)
commitec6204a39b67229bfb05b763d1ceea135150880d
tree232ee138a22313e43c69dbdd98f826dbbdacf028
parentd4732c5d271e9624019ad6771fad3b6aa304e380
parentea3d93b75c347fc63348bd4e39ea7ec2e09e4cd4
Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
README
README
src/df.c