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

[Florian Forster]

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

New commits:
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.