![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sun, 18 Aug 2013 10:14:39 +0000 (12:14 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sun, 18 Aug 2013 10:14:39 +0000 (12:14 +0200) | ||
| commit | c27675331d874c85625d2e64ebcc229db588c5f2 | |
| tree | 7c121f2333842890b2eb988c355981bb5f614ede | tree | snapshot |
| parent | bdf4ac4bba349bac128fea28fac13fda784ae78c | commit | diff |
| parent | c023314cc01ec8fae3f5373aa9dbf2b2a2d339b3 | commit | diff |
Merge branch 'collectd-5.3'
Conflicts:
configure.in
Conflicts:
configure.in
| configure.in | diff1 | | diff2 | | blob | history |
| src/memcached.c | diff1 | | diff2 | | blob | history |
| src/rrdtool.c | diff1 | | diff2 | | blob | history |