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

[Florian Forster]

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

New commits:
commit fe9c4eef067aa252dbbd42a364baafc373421893
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 10:41:29 2008 +0100

    Bumped version to 4.2.4; Updated ChangeLog.

commit cb72a2216def7a5935e28644684df73e68a83425
Merge: 1b8000f6a308481daa4a6a337600e81c45ed9754 d7eb0e344ef9f0a0aa0797462bba25090933fd58
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 10:40:33 2008 +0100

    Merge branch 'collectd-4.1' into collectd-4.2
    
    Conflicts:
    
    	ChangeLog

commit d7eb0e344ef9f0a0aa0797462bba25090933fd58
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 10:39:50 2008 +0100

    ChangeLog: Fixed the date of the 4.1.6 release.