From: Florian Forster <octo@collectd.org>
Date: Fri, 22 May 2015 09:33:27 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0beb06563c5681975fd4f743c547e15f4facb29f;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
	src/write_redis.c
---

0beb06563c5681975fd4f743c547e15f4facb29f