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

[Florian Forster]

 ChangeLog      |   83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 version-gen.sh |    2 +-
 2 files changed, 84 insertions(+), 1 deletion(-)

New commits:
commit 424841e452e65ab2f470b2553d425cfed9b42b64
Author: Florian Forster <octo at collectd.org>
Date:   Mon Apr 8 17:59:28 2013 -0700

    Bump version to 5.2.2; Update ChangeLog.

commit 7d5c193fce64d04cee72619c0b54d624d5011e35
Merge: 842c1a2 3b16869
Author: Florian Forster <octo at collectd.org>
Date:   Mon Apr 8 17:55:06 2013 -0700

    Merge branch 'collectd-5.1' into collectd-5.2
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit 3b168699841135aa3e6d02eec0eb548cba8880d5
Author: Florian Forster <octo at collectd.org>
Date:   Mon Apr 8 17:54:19 2013 -0700

    Bump version to 5.1.3; Update ChangeLog.

commit 32e0d9078b73eeb889b9a1e62be72ded48d33d7d
Merge: 86d3fe4 d4fcd06
Author: Florian Forster <octo at collectd.org>
Date:   Mon Apr 8 17:44:55 2013 -0700

    Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.1
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit d4fcd06107c3c3b0cfcbc8a5014f60d874509b76
Author: Florian Forster <octo at collectd.org>
Date:   Sun Apr 7 20:45:10 2013 +0200

    Bump version to 4.10.9; Update ChangeLog.