![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100) | ||
| commit | 7285e5f59ffa4efb391485fe9b35ee02f3dc856f | |
| tree | ca0beb8cc82b2651536c207306ffd94d3a94c17e | tree | snapshot |
| parent | b48fe5c7fc811271d0a3a1f86ec21054191c0878 | commit | diff |
| parent | 3b51243382501d5f3cdda79d30c7ecf39d22dd87 | commit | diff |
Merge branch 'collectd-5.2'
Conflicts:
src/plugin.c
Conflicts:
src/plugin.c
| src/Makefile.am | diff1 | | diff2 | | blob | history |