![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Thu, 3 Mar 2016 21:16:31 +0000 (22:16 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Thu, 3 Mar 2016 21:16:31 +0000 (22:16 +0100) | ||
| commit | b758f3b7146f1497d93e1df64cbc0c14ae164768 | |
| tree | 0668f088939524c7164301b511c8103ede411ff1 | tree | snapshot |
| parent | 6286127470b83578c2889db546cfa32cb0fe0147 | commit | diff |
| parent | 2bda2a5648c87a2c5b8304238cd80ff17984c5cd | commit | diff |
Merge branch 'collectd-5.5'