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

[Florian Forster]

 ChangeLog |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 588500667f994648222900562b1f5c6ca56ab27e
Author: Florian Forster <octo at collectd.org>
Date:   Fri Oct 14 22:42:26 2011 +0200

    ChangeLog: Remove blank line.
    
    Change-Id: Ief9cabb148d75b79e0764d629c571ee9dc3d7d3b

commit 2652653c3db161442d28709d79c3f2d81ab571ee
Merge: 42ed9d3 7b2265a
Author: Florian Forster <octo at collectd.org>
Date:   Fri Oct 14 22:42:09 2011 +0200

    Merge branch 'collectd-4.10' into collectd-5.0
    
    Conflicts:
    	ChangeLog
    
    Change-Id: I65f02dbcad46460f18f356bc8d32eb15a7a352c2

commit 7b2265a744ca9a3c7c042748b542deae1b6b39c6
Author: Florian Forster <octo at collectd.org>
Date:   Fri Oct 14 22:41:21 2011 +0200

    ChangeLog: Add thanks to Peter Green.
    
    Change-Id: Ie392f7dfc7d637c92e286b0bf6d5d32877f70f76