![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 9 Dec 2009 15:50:42 +0000 (16:50 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 9 Dec 2009 15:50:42 +0000 (16:50 +0100) | ||
| commit | 973b70c411688212c081f5e90b89bd657785b81c | |
| tree | aa6d3cbd3c5633326130a359ba6507eac3686fea | tree | snapshot |
| parent | 8579aab25eae16e266b03e9b623285e56036c922 | commit | diff |
| parent | bc42a61b1f8e518c7decb824dc61e85d4e9f02b8 | commit | diff |
Merge branch 'collectd-4.7' into collectd-4.8