Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 21 Apr 2007 09:39:33 +0000 (11:39 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 21 Apr 2007 09:39:33 +0000 (11:39 +0200)
commitfde47df2296257971379297ff6831d887e0acd39
treed62df478d203365e498a11368f9faa32706438e7
parenta526437ab1236691ee3fc4186a9d670b4bac0ac2
parentd9256059b2a356625feabe5bb44539eef0660d5a
Merge branch 'pull/collectd-4' into collectd-4