![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 14 Sep 2015 08:58:22 +0000 (10:58 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 14 Sep 2015 08:58:22 +0000 (10:58 +0200) | ||
| commit | d6f0273b2ebae6995d69c7701838825b96e4f424 | |
| tree | 447393259d1dcf8c17172a90004f5bdeea93daa5 | tree | snapshot |
| parent | 8fc097046f92322d408505f485834d2a038ebec5 | commit | diff |
| parent | add25ce6f3129cb7138e96e5f55d11de1e5cf6de | commit | diff |
Merge branch 'collectd-5.5'
| configure.ac | diff1 | | diff2 | | blob | history |