[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 README   |   14 +++++++-------
 src/df.c |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit a497509bc0a06065759a6d4e43497b75a2c9ecb8
Merge: 4f0c7b9794d0ea888123502418545c8f1ff3fc9f ec6204a39b67229bfb05b763d1ceea135150880d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 2 09:54:14 2009 +0200

    Merge branch 'collectd-4.8'
    
    Conflicts:
    	src/df.c

commit ec6204a39b67229bfb05b763d1ceea135150880d
Merge: d4732c5d271e9624019ad6771fad3b6aa304e380 ea3d93b75c347fc63348bd4e39ea7ec2e09e4cd4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 2 09:50:20 2009 +0200

    Merge branch 'collectd-4.7' into collectd-4.8
    
    Conflicts:
    	README

commit d4732c5d271e9624019ad6771fad3b6aa304e380
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 2 09:47:54 2009 +0200

    README: Fix order of the curl_json plugin in the list.

commit ea3d93b75c347fc63348bd4e39ea7ec2e09e4cd4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 2 09:47:54 2009 +0200

    README: Fix order of the curl plugin in the list.

commit bf90793e82989b1c36fe8f3b66b9c9fe05c9532d
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Fri Oct 2 08:27:44 2009 +0200

    df plugin: Fix a typo.