![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 18 Aug 2016 20:58:39 +0000 (22:58 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 18 Aug 2016 20:58:39 +0000 (22:58 +0200) | ||
| commit | 3d74a63ae43c1786eb9b966e2209c24c5643dae8 | |
| tree | b3cb58bd0269025f6a68b2b03a83e71f05f859c9 | tree | snapshot |
| parent | 115d242a7027c86a9ad5c2e9ba9fd9f08eccae26 | commit | diff |
| parent | 356901a4a8df5d6f40f9d03d2276d66fe9e13d17 | commit | diff |
Merge branch 'collectd-5.5' into collectd-5.6