![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 7 Jul 2015 22:29:58 +0000 (00:29 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 7 Jul 2015 22:29:58 +0000 (00:29 +0200) | ||
| commit | 24c2f247f6dc5c17b26d715346a380efababb08f | |
| tree | b4729aa509cd5fe06579bf82e5cc26aba25ef03c | tree | snapshot |
| parent | 780e6a76021a240e95007a04b723d827120afa95 | commit | diff |
| parent | 18159adcefb255db5a5234a8476e703deb6cc09f | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5