From: Florian Forster <octo@collectd.org>
Date: Fri, 12 Jul 2013 16:23:20 +0000 (+0200)
Subject: Merge branch 'collectd-5.3'
X-Git-Tag: collectd-5.4.0~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=38d06a8f868293466f4eee943555c65457a5e560;p=collectd.git

Merge branch 'collectd-5.3'

Conflicts:
	src/collectd.conf.pod
---

38d06a8f868293466f4eee943555c65457a5e560