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)
Conflicts:

src/exec.c


No differences found