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

[Florian Forster]

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

New commits:
commit a30f785e3411091fceb2f5c850beb5067c18396d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Jan 2 23:18:15 2009 +0100

    Bumped version to 4.5.2; Updated ChangeLog.

commit 597adb008e5cb9b39bc925046d2aedc084ec2b9e
Merge: 66b7c4bce4e628d8c11cc6762621f155bd68536d d678cfe792f712ed190b65810f5fbcee08e15883
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Jan 2 22:40:44 2009 +0100

    Merge branch 'collectd-4.4' into collectd-4.5
    
    Conflicts:
    
    	ChangeLog
    	version-gen.sh

commit d678cfe792f712ed190b65810f5fbcee08e15883
Author: Florian Forster <octo at noris.net>
Date:   Fri Jan 2 18:31:11 2009 +0100

    Bumped version to 4.4.5; Updated ChangeLog.