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

[Florian Forster]

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

New commits:
commit 35f98b6e5c4c30bd7aeb52c7894c5f6e276638da
Merge: 5137825deeb5d4a5b763185f45b3916ccc49340d 6ec92a34ccbd9454b48685e69405c633026cfe05
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 17:39:06 2009 +0200

    Merge branch 'collectd-4.7'

commit 6ec92a34ccbd9454b48685e69405c633026cfe05
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 17:38:08 2009 +0200

    ChangeLog: Fix a typo.

commit 58ae91b5cc5b27b5317f26c238556f12dbb62258
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 13:04:20 2009 +0200

    Bumped version to 4.7.2; Updated ChangeLog.

commit eb4aab6b6d5af827b5c1fb2f7d2550b7de22fa90
Merge: 307459f5a1d79ee373cf59c7c8a0824d325c43e3 28804fd5c05159cf72401aa70872648fcc5b862e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 13:00:20 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit 28804fd5c05159cf72401aa70872648fcc5b862e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 18 16:36:44 2009 +0200

    Bumped version to 4.6.4; Updated ChangeLog.