Merge branch 'collectd-5.3' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Sat, 6 Sep 2014 09:27:56 +0000 (11:27 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Sep 2014 09:27:56 +0000 (11:27 +0200)
commit21077b074c468a41dbd60baad691ebc7f2991d43
tree7eafc95b6cc1364e1d8f94eb659f055e2e84a5bc
parent1894607dc4c03ce20db7c5256c97890aa70bcaa5
parent61adba6f19b8f6ec08b996f4b2ddc9d6fa5d7fc7
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
src/curl.c
src/curl.c