![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 14 Sep 2015 08:57:37 +0000 (10:57 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 14 Sep 2015 08:57:37 +0000 (10:57 +0200) | ||
| commit | add25ce6f3129cb7138e96e5f55d11de1e5cf6de | |
| tree | e1071f7f7c0682b7ab6b066e705512f39099d57a | tree | snapshot |
| parent | a46da0050dfe27715b9bc504ed2988c466de6d32 | commit | diff |
| parent | 1a0ffe992fa7a970346fafb5f688fce5ee6f22ee | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| configure.ac | diff1 | | diff2 | | blob | history |