![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 9 Feb 2016 22:27:12 +0000 (23:27 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 9 Feb 2016 22:27:12 +0000 (23:27 +0100) | ||
| commit | f7f5868ee0378791ccd8d1788e27ebf2a02737dc | |
| tree | 9ff88d87a94873a6ed339d71b826ac0373fc32e5 | tree | snapshot |
| parent | af634d0a7cd24a7880eff332368db849c5ab3e5e | commit | diff |
| parent | 8fc1bf9987ab1aa8cef8c3125da82de59d93efb1 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5