Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 19 Jul 2009 11:00:20 +0000 (13:00 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 19 Jul 2009 11:00:20 +0000 (13:00 +0200)
commiteb4aab6b6d5af827b5c1fb2f7d2550b7de22fa90
tree0e92e52de2dcd81592a000c7c771e50639e2feeb
parent307459f5a1d79ee373cf59c7c8a0824d325c43e3
parent28804fd5c05159cf72401aa70872648fcc5b862e
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
version-gen.sh
ChangeLog