Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 9 Apr 2008 16:34:48 +0000 (18:34 +0200)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 9 Apr 2008 16:34:48 +0000 (18:34 +0200)
commit3469385f04ffcfa2f4ef06d34ed4b24acb378b34
treeb3632b457443695ba3b7cff2d0c312bf0c50b6bd
parent79e2f5ddc8bffe7ba604530b6090b5d7f7ec9bb1
parent7af919ac4b76af981002875ff7bef99874f745b7
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

src/exec.c
src/exec.c