![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Tue, 8 Dec 2015 13:42:07 +0000 (14:42 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Tue, 8 Dec 2015 13:42:07 +0000 (14:42 +0100) | ||
| commit | 42a7c90f4478e98dc970927cfda7ec2e1081f364 | |
| tree | c5d93e7bbed412aed41a18d1fc13217706c4f293 | tree | snapshot |
| parent | 03f81fa2ddcd60a4bdc7ce78775554da2166fc70 | commit | diff |
| parent | d89829d22853ee0b7678b6e2ee7fdd359f3b7202 | commit | diff |
Merge branch 'collectd-5.5'
| src/collectd-tg.c | diff1 | | diff2 | | blob | history |
| src/email.c | diff1 | | diff2 | | blob | history |
| src/ping.c | diff1 | | diff2 | | blob | history |
| src/postgresql.c | diff1 | | diff2 | | blob | history |
| src/python.c | diff1 | | diff2 | | blob | history |
| src/rrdtool.c | diff1 | | diff2 | | blob | history |
| src/tail.c | diff1 | | diff2 | | blob | history |
| src/utils_format_json.c | diff1 | | diff2 | | blob | history |