![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@crystal.wlan.home.verplant.org> | |
| Wed, 9 Apr 2008 16:34:48 +0000 (18:34 +0200) | ||
| committer | Florian Forster <octo@crystal.wlan.home.verplant.org> | |
| Wed, 9 Apr 2008 16:34:48 +0000 (18:34 +0200) | ||
| commit | 3469385f04ffcfa2f4ef06d34ed4b24acb378b34 | |
| tree | b3632b457443695ba3b7cff2d0c312bf0c50b6bd | tree | snapshot |
| parent | 79e2f5ddc8bffe7ba604530b6090b5d7f7ec9bb1 | commit | diff |
| parent | 7af919ac4b76af981002875ff7bef99874f745b7 | commit | diff |
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
src/exec.c
Conflicts:
src/exec.c
| src/exec.c | diff1 | | diff2 | | blob | history |