![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200) | ||
| commit | c37551925a5dee2731413cd96e1d046528e694c5 | |
| tree | aea6768c21f899b6df1a4f807a4654c8cb5e13a8 | tree | snapshot |
| parent | 15cc454e20e4f34dc465f58e2eb9449d2c0b6746 | commit | diff |
| parent | e428176dff22b00adf14fc082eee7fd7eb3ae040 | commit | diff |
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8