Code

Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 09:36:57 +0000 (10:36 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 09:36:57 +0000 (10:36 +0100)
commit1b8000f6a308481daa4a6a337600e81c45ed9754
tree0965826d56de551a5c81408ba91e9b36c78b29a5
parent225494e854ddaa1c0570ac9a5fa15380b333a919
parentd539c6cdfa3c8664032aa53b0285b5e12882f424
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

ChangeLog
version-gen.sh
ChangeLog