Code

Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 09:40:33 +0000 (10:40 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 09:40:33 +0000 (10:40 +0100)
commitcb72a2216def7a5935e28644684df73e68a83425
treec7319cb0a65e2f173d253ba86cb274e5d04c07dd
parent1b8000f6a308481daa4a6a337600e81c45ed9754
parentd7eb0e344ef9f0a0aa0797462bba25090933fd58
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

ChangeLog
ChangeLog