![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sun, 27 Jan 2013 13:35:25 +0000 (14:35 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sun, 27 Jan 2013 13:35:25 +0000 (14:35 +0100) | ||
| commit | 8291596f0172404039f0928bcaea4b1e4cafbc97 | |
| tree | b8848c92f4e81cf8649f0a57e7a1e2e91e43f47d | tree | snapshot |
| parent | 26ff771b2487cd8e0492f383ecc9b7bf531b3e25 | commit | diff |
| parent | 7bbba254348a7fa98c4337455a3e0eae88ce0e86 | commit | diff |
Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2