Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 16 Apr 2007 12:53:12 +0000 (14:53 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 16 Apr 2007 12:53:12 +0000 (14:53 +0200)
commit967ca89616bf9ccf246eeacf53fc84eb70743386
tree839d9f960360b1b8715fd86a5f7b54c85e2311a0
parent5ba42e086b5258cc9651d7684c92691c7bbcf527
parent06adec208286b5a136ffa5c5f3832c35e9f62844
Merge branch 'pull/collectd-4' into collectd-4