Merge branch 'pull/collectd-4.1' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 23 Sep 2007 13:14:36 +0000 (15:14 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 23 Sep 2007 13:14:36 +0000 (15:14 +0200)
commitf01e1bf6391584c4bec473ba37197b2cbd8f146f
tree3bcd9245d29d14cd28e9f6a6905042279665ec02
parentf54383fea028792d59b3ac845c3fbeb423ca1b4f
parent00ff99d8769ede67a8aefbb2836c1f832dbcab65
Merge branch 'pull/collectd-4.1' into collectd-4.1