![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 29 Nov 2016 14:47:53 +0000 (15:47 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 29 Nov 2016 14:47:53 +0000 (15:47 +0100) | ||
| commit | 176a71f2e7684c4c6ab279b199450d2e0e949161 | |
| tree | 9cfc7c993581dcb580682ffd9611795873b9511d | tree | snapshot |
| parent | fe6da88c2eb1637ef6dce0a7d928c202ededc450 | commit | diff |
| parent | 1584297665665f900011297f1ae0e29ecf9ce379 | commit | diff |
Merge branch 'collectd-5.7'