Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 29 Mar 2008 09:52:45 +0000 (10:52 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 29 Mar 2008 09:52:45 +0000 (10:52 +0100)
commitb92c090faa534fd75ab184afe425331e06b74d0b
treeb2f20d83dd9a6b767c2ef1fed1ab8b2feb5610d7
parente88e5b49dd3cc026d162b64ca100415481756169
parented4c90542af0142d6dc8f05517d17c46668ad60b
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

ChangeLog
version-gen.sh
ChangeLog