Merge branch 'collectd-4.3'
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 9 Apr 2008 16:45:38 +0000 (18:45 +0200)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 9 Apr 2008 16:45:38 +0000 (18:45 +0200)
commitb58af48a482b30999bd0b71c470c5dbab8fd5abd
tree8f2c31addcc9a8d87dbb25d1571ec39d9749657a
parent2fe27dcde5e7839375ab10e75293be531f50838e
parent3469385f04ffcfa2f4ef06d34ed4b24acb378b34
Merge branch 'collectd-4.3'

Conflicts:

src/exec.c
src/exec.c