![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200) | ||
| commit | a09f2fdf0450eb76317e1b7575a12ffb926068f4 | |
| tree | c4ce90f0039a2609bcbb49c8fb5fa97ba605a3f8 | tree | snapshot |
| parent | a9b65b73fc54f48b6f3633efa1a6c89f78a148bf | commit | diff |
| parent | 6124da7a48f28f54fc09ebeb942d1037516fe6ab | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| configure.ac | diff1 | | diff2 | | blob | history |
| src/daemon/plugin.c | diff1 | | | | blob | history |
| src/modbus.c | diff1 | | diff2 | | blob | history |