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

[Florian Forster]

 ChangeLog      |   43 +++++++++++++++++++++++++++++++++++++++++++
 version-gen.sh |    2 +-
 2 files changed, 44 insertions(+), 1 deletions(-)

New commits:
commit 967a0fdefd43db0e4ed5f8cba65c3c345ef6cdfb
Merge: 5f3702fcc67d68d428708e9cf5e5897ad2578925 82882bce5d2d0f48912492223507b8a42b0fb1a9
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 22 11:29:19 2010 +0200

    Merge branch 'collectd-4.9'

commit 82882bce5d2d0f48912492223507b8a42b0fb1a9
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 22 11:28:19 2010 +0200

    Bumped version to 4.9.2; Updated ChangeLog.

commit 105c64c6f20807fa105b6aa350cc79c0d3a38488
Merge: d48a9456e42af4ab5881ab055c95ceab71819bc1 6bbd2007deb393cffa3502902c1bd81c49328d33
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 22 11:14:25 2010 +0200

    Merge branch 'collectd-4.8' into collectd-4.9
    
    Conflicts:
    	ChangeLog

commit 6bbd2007deb393cffa3502902c1bd81c49328d33
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 22 11:06:16 2010 +0200

    Bumped version to 4.8.5; Updated ChangeLog.