Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 13:39:07 +0000 (14:39 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 13:39:07 +0000 (14:39 +0100)
commitd89829d22853ee0b7678b6e2ee7fdd359f3b7202
treef5e6222703f8666ee02b929ded7dae1406b0c61e
parentec38a982f406ad7db8e95bcb0fc61ecaaa71ea0f
parentdc0e64a5811fe065ca88b5c973f4db0dd6f1355f
Merge branch 'collectd-5.4' into collectd-5.5
src/collectd-tg.c
src/email.c
src/ping.c
src/postgresql.c
src/python.c
src/tail.c