![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | bbczeuz <githubmail@zeuz.ch> | |
| Fri, 18 Dec 2015 10:28:14 +0000 (11:28 +0100) | ||
| committer | bbczeuz <githubmail@zeuz.ch> | |
| Fri, 18 Dec 2015 10:28:14 +0000 (11:28 +0100) | ||
| commit | b1b0aa549005c62b0e4651053198693e33ea84f0 | |
| tree | 285d7ca7145de81a69628a45ce80068d9ce0b535 | tree | snapshot |
| parent | 7553f3912f28f356018eb807709856b9ebf7d376 | commit | diff |
| parent | 25888de8d7881514ce4854e39f322ad4240e3d13 | commit | diff |
Merge pull request #5 from collectd/master
merging upstream
merging upstream