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