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

[Florian Forster]

 ChangeLog |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 1b8000f6a308481daa4a6a337600e81c45ed9754
Merge: 225494e854ddaa1c0570ac9a5fa15380b333a919 d539c6cdfa3c8664032aa53b0285b5e12882f424
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 10:36:57 2008 +0100

    Merge branch 'collectd-4.1' into collectd-4.2
    
    Conflicts:
    
    	ChangeLog
    	version-gen.sh

commit d539c6cdfa3c8664032aa53b0285b5e12882f424
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Jan 11 11:24:19 2008 +0100

    Bumped version to 4.1.6; Updated ChangeLog.