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

[Florian Forster]

 ChangeLog      |    4 +++-
 configure.in   |    1 +
 version-gen.sh |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b7d4060cacd04d4bd0e174e85f91ca5afcacf01d
Merge: 87e0b48747170a355f6a703be523a7dbbfbd8549 52b6308247a1656d7e5a69c99eff3b4a19c6b844
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Oct 24 21:36:44 2007 +0200

    Merge branch 'collectd-4.1'
    
    Conflicts:
    
    	ChangeLog
    	contrib/PerlLib/Collectd.pm

commit 52b6308247a1656d7e5a69c99eff3b4a19c6b844
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Oct 24 20:51:51 2007 +0200

    Bumped version to 4.1.3; Updated ChangeLog.

commit 560ba5a3bc3163bfd0c625a1cd9d4c1c15850edf
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Oct 24 20:49:33 2007 +0200

    contrib/PerlLib/Collectd.pm: Bumped version to 4.1.3.

commit 87e0b48747170a355f6a703be523a7dbbfbd8549
Merge: 759f6d627526e42a02c901d2d2d554b597432605 fd04dec304cdcfa25a4777318902cfd1ce6d7a52
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Oct 24 20:11:05 2007 +0200

    Merge branch 'collectd-4.1'

commit fd04dec304cdcfa25a4777318902cfd1ce6d7a52
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Oct 23 00:05:17 2007 +0200

    configure.in: Added "rrdtool" to the module summary.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>