From: Florian Forster <octo@collectd.org>
Date: Sat, 6 Sep 2014 09:27:56 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.2~18
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=21077b074c468a41dbd60baad691ebc7f2991d43;p=collectd.git

Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	src/curl.c
---

21077b074c468a41dbd60baad691ebc7f2991d43