From: Florian Forster <octo@collectd.org>
Date: Mon, 18 Aug 2014 07:35:04 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.2~23
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=fd7673e5e9ad074624fc23cda5d2ec4549d43659;hp=fd7673e5e9ad074624fc23cda5d2ec4549d43659;p=collectd.git

Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	contrib/redhat/collectd.spec
---