Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Sep 2007 08:01:23 +0000 (10:01 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Sep 2007 08:01:23 +0000 (10:01 +0200)
commite6fc1600ee7bcde75c95db9b1f617caf78fc4c6a
tree91a546b026ab6a13b4c2b46f67d06ebda716336a
parent97deb523823b1f04880d584a19bc2b0e7e10d96a
parent6e84354ee29495e07bce5884fa4c7f15cd5b7d4e
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

ChangeLog
ChangeLog
src/apcups.c