![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Thu, 18 Oct 2012 10:49:39 +0000 (12:49 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Thu, 18 Oct 2012 10:49:39 +0000 (12:49 +0200) | ||
| commit | a60550f0b85d413957654546a87f00a95e59a26c | |
| tree | ac029f4ce4166f6f5e10b6ad5aed97cd9d7fbe71 | tree | snapshot |
| parent | a5dac903c9dcc94ba911a91c754541e4534bb58c | commit | diff |
| parent | 400596160704146845940d7d9c4f794c0d2ddc03 | commit | diff |
Merge branch 'collectd-5.0' into collectd-5.1