![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 3 Mar 2015 23:39:09 +0000 (00:39 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 3 Mar 2015 23:39:09 +0000 (00:39 +0100) | ||
| commit | 27aeac9988dde1d53e5df697ce0e1b8a951d091a | |
| tree | 2aaa9572ad0ec54dedbb8d49e286a330965cf052 | tree | snapshot |
| parent | add4647f5dbd0e0d3d0c95903c644f9dcafee33b | commit | diff |
| parent | 584482eb34e3dc0d007922a80c7c39657dca7235 | commit | diff |
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
configure.ac
Conflicts:
configure.ac
| configure.ac | diff1 | | | | blob | history |
| src/plugin.c | diff1 | | diff2 | | blob | history |